Use version-less Qt macros, targets and variables

Prepares for building against Qt6.

Use version-less Qt macros, targets and variables
Prepares for building against Qt6.
0143b635 · Volker Krause · a1fec92e · 0143b635 · 0143b635 · 0143b635
Commit 0143b635 authored Mar 09, 2022 by Volker Krause
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -279,8 +279,8 @@ if (KWIN_BUILD_TABBOX)
    target_link_libraries(kwin Qt::GuiPrivate)
 endif()

-qt5_generate_dbus_interface(virtualkeyboard_dbus.h org.kde.kwin.VirtualKeyboard.xml OPTIONS -A)
-qt5_generate_dbus_interface(tabletmodemanager.h org.kde.KWin.TabletModeManager.xml OPTIONS -A)
+qt_generate_dbus_interface(virtualkeyboard_dbus.h org.kde.kwin.VirtualKeyboard.xml OPTIONS -A)
+qt_generate_dbus_interface(tabletmodemanager.h org.kde.KWin.TabletModeManager.xml OPTIONS -A)

 generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)

@@ -345,7 +345,7 @@ endif()

 install(FILES kwin.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} RENAME ${KWIN_NAME}.kcfg)
 if (KWIN_BUILD_NOTIFICATIONS)
-    install(FILES kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} RENAME ${KWIN_NAME}.notifyrc)
+    install(FILES kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} RENAME ${KWIN_NAME}.notifyrc)
 endif()
 install(
    FILES
@@ -362,4 +362,4 @@ install(
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)

 # Install the KWin/Script service type
-install(FILES scripting/kwinscript.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES scripting/kwinscript.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})
--- a/src/backends/libinput/CMakeLists.txt
+++ b/src/backends/libinput/CMakeLists.txt
-qt5_generate_dbus_interface(device.h org.kde.kwin.InputDevice.xml OPTIONS -A)
+qt_generate_dbus_interface(device.h org.kde.kwin.InputDevice.xml OPTIONS -A)

 add_custom_target(
    KWinInputDBusInterfaces

--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -34,7 +34,7 @@ macro(KWIN4_ADD_EFFECT_MODULE name)
 endmacro()

 # Install the KWin/Effect service type
-install(FILES kwineffect.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES kwineffect.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})

 # scripted effects
 function(install_scripted_effect name)

--- a/src/helpers/wayland_wrapper/CMakeLists.txt
+++ b/src/helpers/wayland_wrapper/CMakeLists.txt
@@ -15,6 +15,6 @@ ecm_qt_declare_logging_category(kwin_wayland_wrapper
        Warning
 )

-target_link_libraries(kwin_wayland_wrapper Qt5::Core Qt5::DBus KF5::DBusAddons KF5::CoreAddons KWinXwaylandCommon)
+target_link_libraries(kwin_wayland_wrapper Qt::Core Qt::DBus KF5::DBusAddons KF5::CoreAddons KWinXwaylandCommon)
 set_property(TARGET kwin_wayland_wrapper PROPERTY C_STANDARD 11)
 install(TARGETS kwin_wayland_wrapper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
--- a/src/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/src/kcmkwin/kwincompositing/CMakeLists.txt
@@ -31,4 +31,4 @@ target_link_libraries(kwincompositing
 )

 install(TARGETS kwincompositing DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES kwincompositing.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kwincompositing.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
--- a/src/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/src/kcmkwin/kwindecoration/CMakeLists.txt
@@ -53,7 +53,7 @@ configure_file(window-decorations.knsrc.cmake ${CMAKE_CURRENT_BINARY_DIR}/window

 # This desktop file is installed only for retrocompatibility with sycoca
 install(FILES kwindecorationsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
-install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/window-decorations.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
 install(TARGETS kcm_kwindecoration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 install(TARGETS kwin-applywindowdecoration DESTINATION ${KDE_INSTALL_LIBEXECDIR})

--- a/src/kcmkwin/kwindesktop/CMakeLists.txt
+++ b/src/kcmkwin/kwindesktop/CMakeLists.txt
@@ -32,5 +32,5 @@ kcoreaddons_desktop_to_json(kcm_kwin_virtualdesktops "kcm_kwin_virtualdesktops.d

 install(FILES virtualdesktopssettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
 install(TARGETS kcm_kwin_virtualdesktops DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-install(FILES kcm_kwin_virtualdesktops.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kcm_kwin_virtualdesktops.desktop  DESTINATION  ${KDE_INSTALL_KSERVICESDIR})
 kpackage_install_package(package kcm_kwin_virtualdesktops kcms)
--- a/src/kcmkwin/kwineffects/CMakeLists.txt
+++ b/src/kcmkwin/kwineffects/CMakeLists.txt
@@ -29,6 +29,6 @@ kcoreaddons_desktop_to_json(kcm_kwin_effects "kcm_kwin_effects.desktop")
 ########### install files ###############

 install(TARGETS kcm_kwin_effects DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-install(FILES kcm_kwin_effects.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kcm_kwin_effects.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 install(FILES kwineffect.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
 kpackage_install_package(package kcm_kwin_effects kcms)
--- a/src/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/src/kcmkwin/kwinoptions/CMakeLists.txt
@@ -38,5 +38,5 @@ install(
    FILES
        kwinoptions.desktop
    DESTINATION
-        ${KDE_INSTALL_KSERVICES5DIR}
+        ${KDE_INSTALL_KSERVICESDIR}
 )
--- a/src/kcmkwin/kwinrules/CMakeLists.txt
+++ b/src/kcmkwin/kwinrules/CMakeLists.txt
@@ -55,7 +55,7 @@ target_link_libraries(kcm_kwinrules KWinRulesObjects)
 kcoreaddons_desktop_to_json(kcm_kwinrules "kcm_kwinrules.desktop" SERVICE_TYPES kcmodule.desktop)

 install(TARGETS kcm_kwinrules DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-install(FILES kcm_kwinrules.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kcm_kwinrules.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 kpackage_install_package(package kcm_kwinrules kcms)

 install(FILES org.kde.kwin_rules_dialog.desktop DESTINATION ${KDE_INSTALL_APPDIR})
--- a/src/kcmkwin/kwinscreenedges/CMakeLists.txt
+++ b/src/kcmkwin/kwinscreenedges/CMakeLists.txt
@@ -59,4 +59,4 @@ add_library(kcm_kwintouchscreen MODULE ${kcm_kwintouchscreenedges_PART_SRCS})
 target_link_libraries(kcm_kwintouchscreen ${X11_LIBRARIES} ${kcm_screenedges_LIBS})

 install(TARGETS kcm_kwinscreenedges kcm_kwintouchscreen DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
--- a/src/kcmkwin/kwinscripts/CMakeLists.txt
+++ b/src/kcmkwin/kwinscripts/CMakeLists.txt
@@ -23,5 +23,5 @@ target_link_libraries(kcm_kwin_scripts
 )

 install(TARGETS kcm_kwin_scripts DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES kwinscripts.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kwinscripts.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 install(FILES kwinscripts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
--- a/src/kcmkwin/kwintabbox/CMakeLists.txt
+++ b/src/kcmkwin/kwintabbox/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(kcm_kwintabbox
 install(TARGETS kcm_kwintabbox DESTINATION ${KDE_INSTALL_PLUGINDIR} )

 ########### install files ###############
-install(FILES kwintabbox.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kwintabbox.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 install(FILES thumbnails/konqueror.png
              thumbnails/kmail.png
              thumbnails/systemsettings.png

--- a/src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt
+++ b/src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt
@@ -24,5 +24,5 @@ target_link_libraries(kcm_virtualkeyboard
 kcoreaddons_desktop_to_json(kcm_virtualkeyboard "kcm_virtualkeyboard.desktop")

 install(TARGETS kcm_virtualkeyboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-install(FILES kcm_virtualkeyboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES kcm_virtualkeyboard.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
 kpackage_install_package(package kcm_virtualkeyboard kcms)
--- a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
+++ b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
@@ -70,4 +70,4 @@ set(QMLFILES
 )
 install(FILES ${QMLFILES} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decoration)
 file(COPY ${QMLFILES} DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decoration/)
-install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})
--- a/src/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt
+++ b/src/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt
@@ -4,7 +4,7 @@ install(DIRECTORY package/
        DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/decorations/kwin4_decoration_qml_plastik)

 install(FILES package/metadata.desktop
-        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/${KWIN_NAME}
+        DESTINATION ${KDE_INSTALL_KSERVICESDIR}/${KWIN_NAME}
        RENAME kwin4_decoration_qml_plastik.desktop)

 file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/decorations/kwin4_decoration_qml_plastik)
--- a/src/tabbox/CMakeLists.txt
+++ b/src/tabbox/CMakeLists.txt
 # Install the KWin/WindowSwitcher service type
-install(FILES kwinwindowswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
-install(FILES kwindesktopswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES kwinwindowswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})
+install(FILES kwindesktopswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR})