Allow to build with Qt6/KF6

Signed-off-by: Andreas Sturmlechner <[email protected]>

Author: a17r

CMakeLists.txt

@@ -1,24 +1,27 @@
 cmake_minimum_required(VERSION 3.16)
 project(KDbg)
 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.84.0")
+set(KF_MIN_VERSION "5.89.0")
 
 set(KDBG_VERSION 3.1.0)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kdbg/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdbg/version.h)
 
-find_package(ECM REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core Widgets
 )
+if(QT_MAJOR_VERSION EQUAL 6)
+    find_package(Qt${QT_MAJOR_VERSION}Core5Compat CONFIG REQUIRED)
+endif()
 
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
     I18n
     Config
     CoreAddons

kdbg/CMakeLists.txt

@@ -89,16 +89,21 @@ IF (HAVE_LIB_UTIL)
 ENDIF (HAVE_LIB_UTIL)
 
 target_link_libraries(kdbg
-    KF5::I18n
-    KF5::ConfigCore
-    KF5::CoreAddons
-    KF5::IconThemes
-    KF5::XmlGui
-    KF5::WindowSystem
+    KF${QT_MAJOR_VERSION}::I18n
+    KF${QT_MAJOR_VERSION}::ConfigCore
+    KF${QT_MAJOR_VERSION}::CoreAddons
+    KF${QT_MAJOR_VERSION}::IconThemes
+    KF${QT_MAJOR_VERSION}::WindowSystem
+    KF${QT_MAJOR_VERSION}::XmlGui
     ${LIB_UTIL}
 )
+if(QT_MAJOR_VERSION EQUAL 6)
+    target_link_libraries(kdbg
+        Qt::Core5Compat
+    )
+endif()
 
 install(TARGETS kdbg ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES kdbg.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES kdbgrc DESTINATION ${KDE_INSTALL_CONFDIR})
-install(FILES kdbgui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdbg)
+install(FILES kdbgui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/kdbg)