Adapt build system against qt6

CMakeLists.txt

@@ -12,8 +12,8 @@ set(KOMPARE_VERSION "${KOMPARE_BASE_VERSION}.${RELEASE_SERVICE_COMPACT_VERSION}"
 
 project(Kompare VERSION ${KOMPARE_VERSION})
 
-set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.85.0")
+set(QT_MIN_VERSION "5.15.2")
+set(KF5_MIN_VERSION "5.90.0")
 
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
@@ -29,7 +29,7 @@ include(ECMSetupVersion)
 include(GenerateExportHeader)
 include(FeatureSummary)
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS
     Core
     PrintSupport
     Widgets

src/CMakeLists.txt

@@ -22,5 +22,5 @@ ecm_qt_install_logging_categories(
 install(FILES
     komparenavigationpart.desktop
     kompareviewpart.desktop
-    DESTINATION  ${KDE_INSTALL_KSERVICETYPES5DIR}
+    DESTINATION  ${KDE_INSTALL_KSERVICETYPESDIR}
 )

src/app/CMakeLists.txt

@@ -30,7 +30,7 @@ target_link_libraries(kompare
     KompareDiff2
     KF5::TextEditor
     KF5::WidgetsAddons
-    Qt5::Widgets
+    Qt::Widgets
 )
 
 install(TARGETS kompare  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

src/interfaces/CMakeLists.txt

@@ -10,7 +10,7 @@ generate_export_header(kompareinterface BASE_NAME KOMPAREINTERFACE)
 
 target_link_libraries(kompareinterface
     PUBLIC
-        Qt5::Core
+        Qt::Core
 )
 
 set_target_properties(kompareinterface PROPERTIES

src/komparenavtreepart/CMakeLists.txt

@@ -19,12 +19,12 @@ ecm_qt_declare_logging_category(komparenavtreepart
 kcoreaddons_desktop_to_json(komparenavtreepart ${CMAKE_CURRENT_BINARY_DIR}/komparenavtreepart.desktop)
 
 target_link_libraries(komparenavtreepart
-    Qt5::Widgets
+    Qt::Widgets
     KF5::Parts
     KF5::IconThemes
     KompareDiff2
 )
 
-install(TARGETS komparenavtreepart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/komparenavtreepart.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS komparenavtreepart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/komparenavtreepart.desktop  DESTINATION  ${KDE_INSTALL_KSERVICESDIR})
 

src/komparepart/CMakeLists.txt

@@ -35,10 +35,10 @@ target_link_libraries(komparepart
     KF5::ConfigWidgets
     KF5::CoreAddons
     KF5::JobWidgets
-    Qt5::PrintSupport
+    Qt::PrintSupport
 )
 
-install(TARGETS komparepart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
+install(TARGETS komparepart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts)
 kcoreaddons_desktop_to_json(komparepart ${CMAKE_CURRENT_BINARY_DIR}/komparepart.desktop)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/komparepart.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/komparepart.desktop  DESTINATION  ${KDE_INSTALL_KSERVICESDIR})