Use version-less Qt targets, variables and macros

Prepares for building against Qt6.
4 years ago · 38c723e596
parent fde7564493
commit 38c723e596
14 changed files with 18 additions and 18 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,7 +5,7 @@ set(PROJECT_VERSION "5.24.80")
 set(PROJECT_VERSION_MAJOR 5)

 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.89")
+set(KF5_MIN_VERSION "5.91")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 set(INSTALL_SDDM_THEME TRUE)
 option(INSTALL_SDDM_WAYLAND_SESSION OFF)
--- a/applets/kicker/plugin/autotests/CMakeLists.txt
+++ b/applets/kicker/plugin/autotests/CMakeLists.txt
@ -6,7 +6,7 @@ if(NOT Qt5QuickTest_FOUND)
 endif()

 add_executable(qmltest qmltest.cpp)
-target_link_libraries(qmltest Qt5::QuickTest)
+target_link_libraries(qmltest Qt::QuickTest)

 macro(qtquick_add_tests)
    if (WIN32)
--- a/dataengines/devicenotifications/CMakeLists.txt
+++ b/dataengines/devicenotifications/CMakeLists.txt
@ -17,4 +17,4 @@ target_link_libraries(plasma_engine_devicenotifications
 ) # todo: add kworkspace once ported

 install(TARGETS plasma_engine_devicenotifications DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
-install(FILES devicenotifications.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
+install(FILES devicenotifications.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
--- a/freespacenotifier/CMakeLists.txt
+++ b/freespacenotifier/CMakeLists.txt
@ -22,5 +22,5 @@ target_link_libraries(freespacenotifier

 ########### install files ###############

-install( FILES freespacenotifier.notifyrc  DESTINATION  ${KDE_INSTALL_KNOTIFY5RCDIR} )
+install( FILES freespacenotifier.notifyrc  DESTINATION  ${KDE_INSTALL_KNOTIFYRCDIR} )
 install( FILES freespacenotifier.kcfg  DESTINATION  ${KDE_INSTALL_KCFGDIR} )
--- a/kcms/formats/CMakeLists.txt
+++ b/kcms/formats/CMakeLists.txt
@ -14,7 +14,7 @@ kconfig_add_kcfg_files(kcm_formats_PART_SRCS formatssettings.kcfgc GENERATE_MOC)
 add_library(kcm_formats MODULE ${kcm_formats_PART_SRCS})

 target_link_libraries(kcm_formats
-    Qt5::Core
+    Qt::Core
    KF5::ConfigCore
    KF5::ConfigGui
    KF5::CoreAddons
--- a/kcms/kfontinst/apps/CMakeLists.txt
+++ b/kcms/kfontinst/apps/CMakeLists.txt
@ -40,10 +40,10 @@ ecm_qt_declare_logging_category(kfontview_bin
 install(TARGETS kfontinst_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 install(TARGETS kfontprint_bin DESTINATION ${KDE_INSTALL_LIBEXECDIR} )
 install(TARGETS kfontview_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
-install(FILES kfontviewui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kfontview )
+install(FILES kfontviewui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/kfontview )
 install(PROGRAMS org.kde.kfontview.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
 install(FILES installfont.desktop DESTINATION
-${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus )
+${KDE_INSTALL_KSERVICESDIR}/ServiceMenus )

 ecm_install_icons( ICONS
                   16-apps-kfontview.png
--- a/kcms/kfontinst/thumbnail/CMakeLists.txt
+++ b/kcms/kfontinst/thumbnail/CMakeLists.txt
@ -10,5 +10,5 @@ add_library(fontthumbnail MODULE ${fontthumbnail_PART_SRCS})
 target_link_libraries(fontthumbnail KF5::Archive KF5::KIOCore KF5::KIOWidgets kfontinstui kfontinst )

 install(TARGETS fontthumbnail  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-install( FILES fontthumbnail.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES fontthumbnail.desktop  DESTINATION  ${KDE_INSTALL_KSERVICESDIR} )

--- a/kcms/kfontinst/viewpart/CMakeLists.txt
+++ b/kcms/kfontinst/viewpart/CMakeLists.txt
@ -12,4 +12,4 @@ target_link_libraries(kfontviewpart KF5::Archive KF5::Parts KF5::XmlGui kfontins

 install(TARGETS kfontviewpart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts )

-install( FILES kfontviewpart.rc DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kfontview )
+install( FILES kfontviewpart.rc DESTINATION  ${KDE_INSTALL_KXMLGUIDIR}/kfontview )
--- a/kcms/users/src/CMakeLists.txt
+++ b/kcms/users/src/CMakeLists.txt
@ -18,7 +18,7 @@ set_source_files_properties(net.reactivated.Fprint.Device.xml
 set_source_files_properties(net.reactivated.Fprint.Manager.xml
                        PROPERTIES NO_NAMESPACE TRUE)
                        
-qt5_add_dbus_interface(kcm_users_SRCS
+qt_add_dbus_interface(kcm_users_SRCS
    org.freedesktop.Accounts.xml
    accounts_interface
 )
@ -28,12 +28,12 @@ qt_add_dbus_interface(kcm_users_SRCS
    user_interface
 )

-qt5_add_dbus_interface(kcm_users_SRCS
+qt_add_dbus_interface(kcm_users_SRCS
    net.reactivated.Fprint.Device.xml
    fprint_device_interface
 )

-qt5_add_dbus_interface(kcm_users_SRCS
+qt_add_dbus_interface(kcm_users_SRCS
    net.reactivated.Fprint.Manager.xml
    fprint_manager_interface
 )
--- a/kioslave/desktop/CMakeLists.txt
+++ b/kioslave/desktop/CMakeLists.txt
@ -7,7 +7,7 @@ endif()
 set(kio_desktop_SRCS kio_desktop.cpp)
 qt_add_dbus_interface( kio_desktop_SRCS ${KDED_DBUS_INTERFACE} kded_interface )

-qt5_generate_dbus_interface( desktopnotifier.h ${CMAKE_CURRENT_BINARY_DIR}/desktopnotifier.xml )
+qt_generate_dbus_interface( desktopnotifier.h ${CMAKE_CURRENT_BINARY_DIR}/desktopnotifier.xml )
 qt_add_dbus_interface( kio_desktop_SRCS ${CMAKE_CURRENT_BINARY_DIR}/desktopnotifier.xml desktopnotifier_interface )

 include_directories(${CMAKE_CURRENT_BINARY_DIR})
--- a/phonon/platform_kde/CMakeLists.txt
+++ b/phonon/platform_kde/CMakeLists.txt
@ -7,5 +7,5 @@ set(kde_PART_SRCS
 kcoreaddons_add_plugin(kde SOURCES ${kde_PART_SRCS} INSTALL_NAMESPACE "phonon_platform")
 target_link_libraries(kde ${PHONON_LIBRARY} KF5::CoreAddons KF5::ConfigCore KF5::WidgetsAddons KF5::I18n KF5::KIOCore KF5::Notifications)

-install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
-install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@ -117,7 +117,7 @@ ecm_install_configured_files(INPUT plasma-plasmashell.service.in @ONLY DESTINATI

 install(FILES
   scripting/plasma-layouttemplate.desktop
-   DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+   DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})

 add_subdirectory(packageplugins)
 if(BUILD_TESTING)
--- a/startkde/plasma-session/CMakeLists.txt
+++ b/startkde/plasma-session/CMakeLists.txt
@ -14,7 +14,7 @@ qt_add_dbus_adaptor( plasma_session_SRCS org.kde.Startup.xml startup.h Startup)

 set(kcminit_adaptor ${plasma-workspace_SOURCE_DIR}/startkde/kcminit/main.h)
 set(kcminit_xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCMinit.xml)
-qt5_generate_dbus_interface( ${kcminit_adaptor} ${kcminit_xml} )
+qt_generate_dbus_interface( ${kcminit_adaptor} ${kcminit_xml} )
 qt_add_dbus_interface( plasma_session_SRCS ${kcminit_xml} kcminit_interface )
 qt_add_dbus_interface( plasma_session_SRCS ${KDED_DBUS_INTERFACE} kded_interface )

--- a/wallpapers/image/CMakeLists.txt
+++ b/wallpapers/image/CMakeLists.txt
@ -54,6 +54,6 @@ plasma_install_package(imagepackage org.kde.image wallpapers wallpaper)
 plasma_install_package(slideshowpackage org.kde.slideshow wallpapers wallpaper)

 configure_file(imagepackage/setaswallpaper.desktop.in imagepackage/setaswallpaper.desktop)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imagepackage/setaswallpaper.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imagepackage/setaswallpaper.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/ServiceMenus)

 install(DIRECTORY imagepackage/contents/ui DESTINATION ${PLASMA_DATA_INSTALL_DIR}/wallpapers/org.kde.slideshow/contents PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE)