Adapt build system for building against qt6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca845f3bee49496de21acb46ecfc241cc3601641..1a346b8f2ed6af9f323d36b5cc581ffa41ab7b3e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
                   SOVERSION 5
 )
 
                   SOVERSION 5
 )
 

-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS

     Core
     Concurrent
     Widgets
     Core
     Concurrent
     Widgets


@@ -89,7 +89,7 @@ set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities librari
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
                       )
 
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
                       )
 

-find_package(Phonon4Qt5 CONFIG REQUIRED)
+find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED)

 
 find_package(PackageKitQt5)
 set_package_properties(PackageKitQt5
 
 find_package(PackageKitQt5)
 set_package_properties(PackageKitQt5


@@ -192,7 +192,7 @@ else()
     )
 endif()
 
     )
 endif()
 

-ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})

 
 ecm_qt_install_logging_categories(
         EXPORT DOLPHIN
 
 ecm_qt_install_logging_categories(
         EXPORT DOLPHIN

diff --git a/DolphinVcsConfig.cmake.in b/DolphinVcsConfig.cmake.in
index f544f4c610ed4232cefbaa64595ee9d298c0908c..b6e3d42f60954025b58d83c214622b98bff1ffbe 100644 (file)
--- a/DolphinVcsConfig.cmake.in
+++ b/DolphinVcsConfig.cmake.in
@@ -2,7 +2,7 @@
 
 include(CMakeFindDependencyMacro)
 
 
 include(CMakeFindDependencyMacro)
 

-find_dependency(Qt5Widgets)
+find_dependency(Qt@QT_MAJOR_VERSION@Widgets)

 find_dependency(KF5KIO)
 
 include("${CMAKE_CURRENT_LIST_DIR}/DolphinVcsTargets.cmake")
 find_dependency(KF5KIO)
 
 include("${CMAKE_CURRENT_LIST_DIR}/DolphinVcsTargets.cmake")

diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
index b5f6a80b0b6f0a3fd417eda9ff280ed13c259268..e2e32460274c9ec3810a993d4a606161fa3a7bb8 100644 (file)
--- a/cmake/DbusInterfaceMacros.cmake
+++ b/cmake/DbusInterfaceMacros.cmake
@@ -1,5 +1,5 @@
 macro (generate_and_install_dbus_interface main_project_target header_file output_xml_file)
 macro (generate_and_install_dbus_interface main_project_target header_file output_xml_file)

-    qt5_generate_dbus_interface(
+    qt_generate_dbus_interface(

         ${header_file}
         ${output_xml_file}
     )
         ${header_file}
         ${output_xml_file}
     )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 016edb8d3c2e3eb03581e8477d7d5163178d1e03..bb898b5a75f1029a0901488ea1a527d3c0d2791f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
 
 target_link_libraries(
     dolphinvcs PUBLIC
 
 target_link_libraries(
     dolphinvcs PUBLIC

-    Qt5::Widgets
+    Qt${QT_MAJOR_VERSION}::Widgets

 )
 
 set_target_properties(dolphinvcs PROPERTIES
 )
 
 set_target_properties(dolphinvcs PROPERTIES


@@ -50,7 +50,7 @@ ecm_generate_headers(dolphinvcs_LIB_HEADERS
 
 install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 

-install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})

 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
 install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
 install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel)
 


@@ -145,8 +145,8 @@ generate_export_header(dolphinprivate BASE_NAME dolphin)
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
 target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs

-    Qt5::Concurrent
-    Qt5::Gui
+    Qt${QT_MAJOR_VERSION}::Concurrent
+    Qt${QT_MAJOR_VERSION}::Gui

     KF5::I18n
     KF5::IconThemes
     KF5::KIOCore
     KF5::I18n
     KF5::IconThemes
     KF5::KIOCore


@@ -198,7 +198,7 @@ target_link_libraries(dolphinpart
 
 install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
 
 
 install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)
 

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})

 
 ##########################################
 
 
 ##########################################
 


@@ -291,10 +291,10 @@ kconfig_add_kcfg_files(dolphinstatic GENERATE_MOC
     settings/dolphin_generalsettings.kcfgc
 )
 
     settings/dolphin_generalsettings.kcfgc
 )
 

-qt5_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml)
-qt5_add_dbus_adaptor(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindow.h DolphinMainWindow)
-qt5_add_dbus_interface(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindowinterface)
-qt5_add_dbus_interface(dolphin_dbus_SRCS panels/terminal/org.kde.KIOFuse.VFS.xml kiofuse_interface)
+qt_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dolphinmainwindow.h org.kde.DolphinMainWindow.xml)
+qt_add_dbus_adaptor(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindow.h DolphinMainWindow)
+qt_add_dbus_interface(dolphin_dbus_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.DolphinMainWindow.xml dolphinmainwindowinterface)
+qt_add_dbus_interface(dolphin_dbus_SRCS panels/terminal/org.kde.KIOFuse.VFS.xml kiofuse_interface)

 
 target_sources(dolphinstatic PRIVATE
     ${dolphin_dbus_SRCS}
 
 target_sources(dolphinstatic PRIVATE
     ${dolphin_dbus_SRCS}


@@ -415,9 +415,9 @@ if(NOT WIN32)
     target_link_libraries(kcm_dolphingeneral dolphinprivate)
 
     install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
     target_link_libraries(kcm_dolphingeneral dolphinprivate)
 
     install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )

-    install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-    install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-    install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+    install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} )
+    install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} )
+    install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} )

 
     install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
     install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
 
     install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )
     install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms )


@@ -449,6 +449,5 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
 
 if(BUILD_TESTING)
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
 
 if(BUILD_TESTING)

-    find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)

     add_subdirectory(tests)
 endif()
     add_subdirectory(tests)
 endif()

diff --git a/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt b/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
index 46b1590794f6be249d49442f58576429c2531423..da9f839551155e0f3306418bedbbe42f7d71c2d4 100644 (file)
--- a/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
+++ b/src/settings/contextmenu/servicemenuinstaller/CMakeLists.txt
@@ -3,8 +3,8 @@ add_definitions(-DTRANSLATION_DOMAIN=\"dolphin_servicemenuinstaller\")
 
 add_executable(servicemenuinstaller servicemenuinstaller.cpp)
 target_link_libraries(servicemenuinstaller PRIVATE
 
 add_executable(servicemenuinstaller servicemenuinstaller.cpp)
 target_link_libraries(servicemenuinstaller PRIVATE

-    Qt5::Core
-    Qt5::Gui
+    Qt${QT_MAJOR_VERSION}::Core
+    Qt${QT_MAJOR_VERSION}::Gui

     KF5::I18n
     KF5::CoreAddons
 )
     KF5::I18n
     KF5::CoreAddons
 )

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 909bc9edf607800f69380d9effd76364d59bac2a..64003850c568ad61f4b7a78bf45a68e68d279571 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,68 +1,68 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 

-find_package(Qt5Test CONFIG REQUIRED)
+find_package(Qt${QT_MAJOR_VERSION}Test CONFIG REQUIRED)

 include(ECMAddTests)
 
 include(FindGem)  # For servicemenutest, see bottom of this file
 
 # KItemSetTest
 include(ECMAddTests)
 
 include(FindGem)  # For servicemenutest, see bottom of this file
 
 # KItemSetTest

-ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
+ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # KItemRangeTest
 
 # KItemRangeTest

-ecm_add_test(kitemrangetest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
+ecm_add_test(kitemrangetest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 
 # KItemListSelectionManagerTest
 
 
 # KItemListSelectionManagerTest

-ecm_add_test(kitemlistselectionmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
+ecm_add_test(kitemlistselectionmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # KItemListControllerTest
 ecm_add_test(kitemlistcontrollertest.cpp testdir.cpp
 TEST_NAME kitemlistcontrollertest
 
 # KItemListControllerTest
 ecm_add_test(kitemlistcontrollertest.cpp testdir.cpp
 TEST_NAME kitemlistcontrollertest

-LINK_LIBRARIES dolphinprivate Qt5::Test)
+LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # KFileItemListViewTest
 ecm_add_test(kfileitemlistviewtest.cpp testdir.cpp
 TEST_NAME kfileitemlistviewtest
 
 # KFileItemListViewTest
 ecm_add_test(kfileitemlistviewtest.cpp testdir.cpp
 TEST_NAME kfileitemlistviewtest

-LINK_LIBRARIES dolphinprivate Qt5::Test)
+LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # KFileItemModelTest
 ecm_add_test(kfileitemmodeltest.cpp testdir.cpp
 TEST_NAME kfileitemmodeltest
 
 # KFileItemModelTest
 ecm_add_test(kfileitemmodeltest.cpp testdir.cpp
 TEST_NAME kfileitemmodeltest

-LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)

 
 # KFileItemModelBenchmark, not run automatically with `ctest` or `make test`
 add_executable(kfileitemmodelbenchmark kfileitemmodelbenchmark.cpp testdir.cpp)
 
 # KFileItemModelBenchmark, not run automatically with `ctest` or `make test`
 add_executable(kfileitemmodelbenchmark kfileitemmodelbenchmark.cpp testdir.cpp)

-target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt5::Test)
+target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # KItemListKeyboardSearchManagerTest
 
 # KItemListKeyboardSearchManagerTest

-ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
+ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 # DolphinSearchBox
 if (KF5Baloo_FOUND)
     ecm_add_test(dolphinsearchboxtest.cpp
     TEST_NAME dolphinsearchboxtest
 
 # DolphinSearchBox
 if (KF5Baloo_FOUND)
     ecm_add_test(dolphinsearchboxtest.cpp
     TEST_NAME dolphinsearchboxtest

-    LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+    LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)

 endif()
 
 # DolphinQuery
 if (KF5Baloo_FOUND)
     ecm_add_test(dolphinquerytest.cpp
     TEST_NAME dolphinquerytest
 endif()
 
 # DolphinQuery
 if (KF5Baloo_FOUND)
     ecm_add_test(dolphinquerytest.cpp
     TEST_NAME dolphinquerytest

-    LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+    LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)

 endif()
 
 # ViewPropertiesTest
 ecm_add_test(viewpropertiestest.cpp testdir.cpp
 TEST_NAME viewpropertiestest
 endif()
 
 # ViewPropertiesTest
 ecm_add_test(viewpropertiestest.cpp testdir.cpp
 TEST_NAME viewpropertiestest

-LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)

 
 # DolphinMainWindowTest
 ecm_add_test(dolphinmainwindowtest.cpp ${CMAKE_SOURCE_DIR}/src/dolphin.qrc
 TEST_NAME dolphinmainwindowtest
 
 # DolphinMainWindowTest
 ecm_add_test(dolphinmainwindowtest.cpp ${CMAKE_SOURCE_DIR}/src/dolphin.qrc
 TEST_NAME dolphinmainwindowtest

-LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+LINK_LIBRARIES dolphinprivate dolphinstatic Qt${QT_MAJOR_VERSION}::Test)

 
 # DragAndDropHelperTest
 
 # DragAndDropHelperTest

-ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
+ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt${QT_MAJOR_VERSION}::Test)

 
 find_gem(test-unit)
 set_package_properties(Gem:test-unit PROPERTIES
 
 find_gem(test-unit)
 set_package_properties(Gem:test-unit PROPERTIES