Adapt build system for building against qt6

CMakeLists.txt

@@ -46,7 +46,7 @@ set(PIMCOMMON_LIB_VERSION "5.19.40")
 set(AKONADI_VERSION "5.19.40")
 set(AKONADI_NOTES_VERSION "5.19.40")
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test PrintSupport)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test PrintSupport)
 find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -99,7 +99,7 @@ install(EXPORT KF5CalendarSupportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/calendarsupport_version.h
-  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
+  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
 )
 
 

src/CMakeLists.txt

@@ -93,7 +93,7 @@ endif()
 generate_export_header(KF5CalendarSupport BASE_NAME calendarsupport)
 
 
-target_include_directories(KF5CalendarSupport INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/CalendarSupport/;${KDE_INSTALL_INCLUDEDIR_KF5}/calendarsupport>")
+target_include_directories(KF5CalendarSupport INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/CalendarSupport/;${KDE_INSTALL_INCLUDEDIR_KF}/calendarsupport>")
 target_include_directories(KF5CalendarSupport PUBLIC "$<BUILD_INTERFACE:${calendarsupport_SOURCE_DIR}/src;${calendarsupport_BINARY_DIR}/src>")
 
 target_link_libraries(
@@ -102,7 +102,7 @@ PUBLIC
   KF5::Mime
   KF5::IdentityManagement
   KF5::AkonadiCalendar
-  Qt::PrintSupport
+  Qt${QT_MAJOR_VERSION}::PrintSupport
 PRIVATE
   KF5::I18n
   KF5::Completion
@@ -182,7 +182,7 @@ ecm_generate_headers(CalendarSupport_CamelCasefreebusy_HEADERS
 
 ecm_generate_pri_file(BASE_NAME CalendarSupport
     LIB_NAME KF5CalendarSupport
-    DEPS "KMime KIdentityManagement AkonadiCalendar" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/CalendarSupport
+    DEPS "KMime KIdentityManagement AkonadiCalendar" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/CalendarSupport
 )
 
 install(FILES
@@ -190,7 +190,7 @@ install(FILES
     ${CalendarSupport_CamelCaseprinter_HEADERS}
     ${CalendarSupport_CamelCasenext_HEADERS}
     ${CalendarSupport_CamelCasefreebusy_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/CalendarSupport
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/CalendarSupport
     COMPONENT Devel
 )
 
@@ -207,7 +207,7 @@ install(FILES
     ${CalendarSupport_printer_HEADERS}
     ${CalendarSupport_next_HEADERS}
     ${CalendarSupport_freebusy_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/calendarsupport
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/calendarsupport
     COMPONENT Devel
 )
 install(FILES

src/autotests/CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 add_test(NAME noteeditdialogtest COMMAND noteeditdialogtest)
 ecm_mark_as_test(noteeditdialogtest)
 target_link_libraries(noteeditdialogtest
-  Qt::Test
+  Qt${QT_MAJOR_VERSION}::Test
   KF5::AkonadiWidgets
   KF5::AkonadiNotes
   KF5::CalendarSupport

src/freebusymodel/autotests/CMakeLists.txt

@@ -4,7 +4,7 @@ macro(add_libkdepim_freebusymodel_unittest _name)
     ecm_add_test(${_name}.cpp
         TEST_NAME ${_name}
         NAME_PREFIX "libkdepim-freebusymodel-"
-        LINK_LIBRARIES Qt::Test KF5::AkonadiCore KF5::CalendarUtils KF5::CalendarCore KF5::CalendarSupport
+        LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiCore KF5::CalendarUtils KF5::CalendarCore KF5::CalendarSupport
     )
 endmacro()