From 0ce90f433584a41fb0ec96eda87cfcc4e57af7fe Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Fri, 21 Oct 2022 20:58:24 +0200 Subject: [PATCH] Add Qt 6 Linux CI The CI now has the ability to limit the passing unit test requirements to more specific platform configurations, so the not yet working Qt 6 unit tests shouldn't block this anymore. --- .gitlab-ci.yml | 1 + .kde-ci.yml | 2 +- src/backends/drm/drm_object.h | 2 ++ src/core/colortransformation.h | 2 +- src/scripting/scriptedeffect.cpp | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24b5342dd1..4c5651c873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml suse_tumbleweed_qt515_reduced_featureset: extends: suse_tumbleweed_qt515 diff --git a/.kde-ci.yml b/.kde-ci.yml index 76e651b1a7..354405a61d 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -37,4 +37,4 @@ Dependencies: Options: use-ccache: True - require-passing-tests-on: [ 'Linux'] + require-passing-tests-on: [ 'Linux/Qt5'] diff --git a/src/backends/drm/drm_object.h b/src/backends/drm/drm_object.h index 68f85073a8..c6bb0b2e57 100644 --- a/src/backends/drm/drm_object.h +++ b/src/backends/drm/drm_object.h @@ -12,6 +12,8 @@ #include #include +#include + // drm #include diff --git a/src/core/colortransformation.h b/src/core/colortransformation.h index bfb3947ab8..51dd22783a 100644 --- a/src/core/colortransformation.h +++ b/src/core/colortransformation.h @@ -8,10 +8,10 @@ */ #pragma once -#include #include #include #include +#include #include "kwin_export.h" diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp index 94997e0fdd..e0ba99e4a0 100644 --- a/src/scripting/scriptedeffect.cpp +++ b/src/scripting/scriptedeffect.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include