fix: support current Qt6 Debian builds

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.16)
 
 project(cutefish-qt-plugins)
 

debian/control

@@ -7,6 +7,7 @@ Build-Depends: cmake,
                extra-cmake-modules,
                libkf6windowsystem-dev,
                libqt6xdg-dev,
+               pkg-config,
                libxcb-shape0-dev,
                libxcb-icccm4-dev,
                libxcb1-dev,

debian/rules

@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export QT_SELECT=5
-
 %:
 	dh $@
 

platformtheme/CMakeLists.txt

@@ -6,14 +6,17 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Widgets QuickControls2 DBus)
-find_package(Qt6Gui CONFIG REQUIRED Private)
+find_package(Qt6Gui CONFIG QUIET COMPONENTS Private)
+if(NOT TARGET Qt6::GuiPrivate)
+    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+endif()
 find_package(KF6WindowSystem REQUIRED)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(Qt6XdgIconLoader REQUIRED IMPORTED_TARGET Qt6XdgIconLoader)
 find_path(QT6XDGICONLOADER_PRIVATE_INCLUDE_DIR
     NAMES private/xdgiconloader/xdgiconloader_p.h
-    PATHS /usr/include/qt6xdgiconloader
-    PATH_SUFFIXES 4.1.0
+    PATHS ${Qt6XdgIconLoader_INCLUDE_DIRS} /usr/include/qt6xdgiconloader
+    PATH_SUFFIXES ${Qt6XdgIconLoader_VERSION}
     REQUIRED
 )
 

widgetstyle/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(cutefishstyle)
 
 set(TARGET cutefishstyle)
@@ -11,7 +11,10 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_S
 
 set(QT Core Gui Widgets DBus)
 find_package(Qt6 REQUIRED ${QT})
-find_package(Qt6Gui CONFIG REQUIRED Private)
+find_package(Qt6Gui CONFIG QUIET COMPONENTS Private)
+if(NOT TARGET Qt6::GuiPrivate)
+    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+endif()
 find_package(PkgConfig REQUIRED)
 find_package(KF6WindowSystem REQUIRED)