From 3c95d5adfb3d9e7003c5a15a37c3a4dbef826e58 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 15 Jan 2022 11:19:17 +0100
Subject: [PATCH] Add KF6 build support and CI

---
 .gitlab-ci.yml              | 1 +
 CMakeLists.txt              | 6 +++---
 KDecoration2Config.cmake.in | 2 +-
 src/CMakeLists.txt          | 2 +-
 src/private/CMakeLists.txt  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9680a1..2fa3f3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,3 +4,4 @@
 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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6b4304..e3bb2f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(decoration-api)
 set(PROJECT_VERSION "5.24.80")
 
 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.86")
+set(KF5_MIN_VERSION "5.90")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -29,7 +29,7 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KDECORATION2
                         SOVERSION 5)
 
 #dependencies
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     Gui
     Test
@@ -78,7 +78,7 @@ install(EXPORT KDecoration2Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE
 
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdecoration2_version.h
-        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/KDecoration2Config.cmake.in b/KDecoration2Config.cmake.in
index 57a5f88..cc340f7 100644
--- a/KDecoration2Config.cmake.in
+++ b/KDecoration2Config.cmake.in
@@ -1,7 +1,7 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(Qt5Gui @QT_MIN_VERSION@)
+find_dependency(Qt@QT_MAJOR_VERSION@Gui @QT_MIN_VERSION@)
 
 
 include("${CMAKE_CURRENT_LIST_DIR}/KDecoration2Targets.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b2dcf4..c451360 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,7 @@ install(FILES ${KDecoration2_CamelCase_HEADERS}
         DESTINATION ${KDECORATION2_INCLUDEDIR}/KDecoration2
         COMPONENT Devel)
 
-install(TARGETS kdecorations2 EXPORT KDecoration2Targets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdecorations2 EXPORT KDecoration2Targets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(
     FILES
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
index 22f9ac3..9e92aa6 100644
--- a/src/private/CMakeLists.txt
+++ b/src/private/CMakeLists.txt
@@ -45,7 +45,7 @@ install(FILES ${KDecoration2Private_CamelCase_HEADERS}
         DESTINATION ${KDECORATION2_INCLUDEDIR}/KDecoration2/Private
         COMPONENT Devel)
 
-install(TARGETS kdecorations2private EXPORT KDecoration2Targets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdecorations2private EXPORT KDecoration2Targets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(
     FILES
-- 
GitLab