From 7f03aa548c233ab44d1cbb12f3ced8303ce95b9c Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 14 Dec 2023 00:49:54 +0100
Subject: [PATCH] Fully port to Qt6

---
 .gitlab-ci.yml | 7 ++-----
 CMakeLists.txt | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb06ab1ec..06e26021a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,9 @@
 include:
   - project: sysadmin/ci-utilities
     file:
-      - /gitlab-templates/linux.yml
-      - /gitlab-templates/freebsd.yml
-      - /gitlab-templates/windows.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/clang-format.yml
-      - /gitlab-templates/craft-windows-x86-64.yml
-      - /gitlab-templates/craft-windows-appx-qt5.yml
+      # - /gitlab-templates/craft-windows-x86-64-qt6.yml TODO re-enable when Qt6 Craft build works
+      # - /gitlab-templates/craft-windows-appx-qt6.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c3ab5975..359835a86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
 
 project(kdeconnect VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "5.101.0")
-set(QT_MIN_VERSION "5.15.2")
+set(KF_MIN_VERSION "5.240")
+set(QT_MIN_VERSION "6.6.0")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@@ -49,8 +49,8 @@ else()
 endif()
 
 ecm_set_disabled_deprecation_versions(
-    QT ${QT_MIN_VERSION}
-    KF ${KF_MIN_VERSION}
+    QT 5.15
+    KF 5.110
 )
 
 # Make the version header available by linking against kdeconnectversion