Use versionless Qt cmake target

This makes it easier to build against both Qt5 and Qt6

GIT_SILENT

CMakeLists.txt

@@ -410,7 +410,7 @@ configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h)
 set(kwin_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kwin.Effects.xml)
 qt5_add_dbus_interface(effects_interface_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 add_library(KWinEffectsInterface STATIC ${effects_interface_SRCS})
-target_link_libraries(KWinEffectsInterface Qt5::DBus)
+target_link_libraries(KWinEffectsInterface Qt::DBus)
 
 include_directories(BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects
@@ -613,10 +613,10 @@ target_link_libraries(kwin
     kwineffects
     kwinglutils
 
-    Qt5::Concurrent
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::Script
+    Qt::Concurrent
+    Qt::DBus
+    Qt::Quick
+    Qt::Script
 
     KF5::ConfigCore
     KF5::ConfigWidgets
@@ -695,7 +695,7 @@ if(CMAKE_SYSTEM MATCHES "FreeBSD")
 endif()
 
 add_executable(kwin_x11 main_x11.cpp)
-target_link_libraries(kwin_x11 kwin KF5::Crash Qt5::X11Extras)
+target_link_libraries(kwin_x11 kwin KF5::Crash Qt::X11Extras)
 
 install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

autotests/CMakeLists.txt

@@ -14,7 +14,7 @@ add_subdirectory(tabbox)
 ########################################################
 set(testScreenPaintData_SRCS test_screen_paint_data.cpp)
 add_executable(testScreenPaintData ${testScreenPaintData_SRCS})
-target_link_libraries(testScreenPaintData kwineffects Qt5::Test Qt5::Widgets KF5::WindowSystem)
+target_link_libraries(testScreenPaintData kwineffects Qt::Test Qt::Widgets KF5::WindowSystem)
 add_test(NAME kwin-testScreenPaintData COMMAND testScreenPaintData)
 ecm_mark_as_test(testScreenPaintData)
 
@@ -23,7 +23,7 @@ ecm_mark_as_test(testScreenPaintData)
 ########################################################
 set(testWindowPaintData_SRCS test_window_paint_data.cpp)
 add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
-target_link_libraries(testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
+target_link_libraries(testWindowPaintData kwineffects Qt::Widgets Qt::Test )
 add_test(NAME kwin-testWindowPaintData COMMAND testWindowPaintData)
 ecm_mark_as_test(testWindowPaintData)
 
@@ -37,8 +37,8 @@ set(testVirtualDesktops_SRCS
 add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
 
 target_link_libraries(testVirtualDesktops
-    Qt5::Test
-    Qt5::Widgets
+    Qt::Test
+    Qt::Widgets
 
     KF5::ConfigCore
     KF5::GlobalAccel
@@ -60,10 +60,10 @@ add_executable(testClientMachine ${testClientMachine_SRCS})
 set_target_properties(testClientMachine PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 
 target_link_libraries(testClientMachine
-    Qt5::Concurrent
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Concurrent
+    Qt::Test
+    Qt::Widgets
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::WindowSystem
@@ -85,9 +85,9 @@ set(testXcbWrapper_SRCS
 add_executable(testXcbWrapper ${testXcbWrapper_SRCS})
 
 target_link_libraries(testXcbWrapper
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Test
+    Qt::Widgets
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::WindowSystem
@@ -101,9 +101,9 @@ if (XCB_ICCCM_FOUND)
     add_executable(testXcbSizeHints test_xcb_size_hints.cpp)
     set_target_properties(testXcbSizeHints PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
     target_link_libraries(testXcbSizeHints
-        Qt5::Test
-        Qt5::Widgets
-        Qt5::X11Extras
+        Qt::Test
+        Qt::Widgets
+        Qt::X11Extras
 
         KF5::ConfigCore
         KF5::WindowSystem
@@ -124,9 +124,9 @@ set(testXcbWindow_SRCS
 add_executable(testXcbWindow ${testXcbWindow_SRCS})
 
 target_link_libraries(testXcbWindow
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Test
+    Qt::Widgets
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::WindowSystem
@@ -148,9 +148,9 @@ add_executable(testBuiltInEffectLoader ${testBuiltInEffectLoader_SRCS})
 set_target_properties(testBuiltInEffectLoader PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 
 target_link_libraries(testBuiltInEffectLoader
-    Qt5::Concurrent
-    Qt5::Test
-    Qt5::X11Extras
+    Qt::Concurrent
+    Qt::Test
+    Qt::X11Extras
 
     KF5::Package
 
@@ -182,11 +182,11 @@ kconfig_add_kcfg_files(testScriptedEffectLoader_SRCS ../settings.kcfgc)
 add_executable(testScriptedEffectLoader ${testScriptedEffectLoader_SRCS})
 
 target_link_libraries(testScriptedEffectLoader
-    Qt5::Concurrent
-    Qt5::Qml
-    Qt5::Script
-    Qt5::Test
-    Qt5::X11Extras
+    Qt::Concurrent
+    Qt::Qml
+    Qt::Script
+    Qt::Test
+    Qt::X11Extras
 
     KF5::ConfigGui
     KF5::GlobalAccel
@@ -212,9 +212,9 @@ set(testPluginEffectLoader_SRCS
 add_executable(testPluginEffectLoader ${testPluginEffectLoader_SRCS})
 
 target_link_libraries(testPluginEffectLoader
-    Qt5::Concurrent
-    Qt5::Test
-    Qt5::X11Extras
+    Qt::Concurrent
+    Qt::Test
+    Qt::X11Extras
 
     KF5::Package
 
@@ -264,9 +264,9 @@ add_executable(testScreenEdges ${testScreenEdges_SRCS})
 set_target_properties(testScreenEdges PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 target_include_directories(testScreenEdges BEFORE PRIVATE ./)
 target_link_libraries(testScreenEdges
-    Qt5::DBus
-    Qt5::Test
-    Qt5::X11Extras
+    Qt::DBus
+    Qt::Test
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::ConfigGui
@@ -300,10 +300,10 @@ set(testOnScreenNotification_SRCS
 add_executable(testOnScreenNotification ${testOnScreenNotification_SRCS})
 
 target_link_libraries(testOnScreenNotification
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::Test
-    Qt5::Widgets # QAction include
+    Qt::DBus
+    Qt::Quick
+    Qt::Test
+    Qt::Widgets # QAction include
 
     KF5::ConfigCore
 )
@@ -321,7 +321,7 @@ set(testGestures_SRCS
 add_executable(testGestures ${testGestures_SRCS})
 
 target_link_libraries(testGestures
-    Qt5::Test
+    Qt::Test
 )
 
 add_test(NAME kwin-testGestures COMMAND testGestures)
@@ -333,7 +333,7 @@ ecm_mark_as_test(testGestures)
 add_executable(testX11TimestampUpdate test_x11_timestamp_update.cpp)
 target_link_libraries(testX11TimestampUpdate
     KF5::CoreAddons
-    Qt5::Test
+    Qt::Test
     kwin
 )
 add_test(NAME kwin-testX11TimestampUpdate COMMAND testX11TimestampUpdate)
@@ -349,7 +349,7 @@ if (HAVE_EPOXY_GLX)
     set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../plugins/platforms/x11/standalone/glx_context_attribute_builder.cpp)
 endif()
 add_executable(testOpenGLContextAttributeBuilder ${testOpenGLContextAttributeBuilder_SRCS})
-target_link_libraries(testOpenGLContextAttributeBuilder Qt5::Test)
+target_link_libraries(testOpenGLContextAttributeBuilder Qt::Test)
 add_test(NAME kwin-testOpenGLContextAttributeBuilder COMMAND testOpenGLContextAttributeBuilder)
 ecm_mark_as_test(testOpenGLContextAttributeBuilder)
 
@@ -359,9 +359,9 @@ set(testXkb_SRCS
 )
 add_executable(testXkb ${testXkb_SRCS})
 target_link_libraries(testXkb
-    Qt5::Gui
-    Qt5::Test
-    Qt5::Widgets
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
 
     KF5::ConfigCore
     Plasma::KWaylandServer
@@ -374,15 +374,15 @@ ecm_mark_as_test(testXkb)
 
 if (HAVE_GBM)
     add_executable(testGbmSurface test_gbm_surface.cpp ../plugins/platforms/drm/gbm_surface.cpp)
-    target_link_libraries(testGbmSurface Qt5::Test)
+    target_link_libraries(testGbmSurface Qt::Test)
     add_test(NAME kwin-testGbmSurface COMMAND testGbmSurface)
     ecm_mark_as_test(testGbmSurface)
 endif()
 
 add_executable(testVirtualKeyboardDBus test_virtualkeyboard_dbus.cpp ../virtualkeyboard_dbus.cpp)
 target_link_libraries(testVirtualKeyboardDBus
-    Qt5::DBus
-    Qt5::Test
+    Qt::DBus
+    Qt::Test
 )
 add_test(NAME kwin-testVirtualKeyboardDBus COMMAND testVirtualKeyboardDBus)
 ecm_mark_as_test(testVirtualKeyboardDBus)
@@ -393,7 +393,7 @@ ecm_mark_as_test(testVirtualKeyboardDBus)
 ########################################################
 add_executable(testFtrace test_ftrace.cpp)
 target_link_libraries(testFtrace
-    Qt5::Test
+    Qt::Test
     kwin
 )
 add_test(NAME kwin-testFtrace COMMAND testFtrace)

autotests/drm/CMakeLists.txt

@@ -10,7 +10,7 @@ set(mockDRM_SRCS
 )
 
 add_library(mockDrm STATIC ${mockDRM_SRCS})
-target_link_libraries(mockDrm Qt5::Gui)
+target_link_libraries(mockDrm Qt::Gui)
 ecm_mark_as_test(mockDrm)
 
 function(drmTest)
@@ -18,7 +18,7 @@ function(drmTest)
     set(multiValueArgs SRCS )
     cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     add_executable(${ARGS_NAME} ${ARGS_SRCS})
-    target_link_libraries(${ARGS_NAME} mockDrm Qt5::Test)
+    target_link_libraries(${ARGS_NAME} mockDrm Qt::Test)
     add_test(NAME kwin-drm-${ARGS_NAME} COMMAND ${ARGS_NAME})
     ecm_mark_as_test(${ARGS_NAME})
 endfunction()

autotests/integration/CMakeLists.txt

@@ -27,7 +27,7 @@ ecm_add_qtwayland_client_protocol(KWinIntegrationTestFramework_SOURCES
 )
 add_library(KWinIntegrationTestFramework STATIC ${KWinIntegrationTestFramework_SOURCES})
 target_link_libraries(KWinIntegrationTestFramework
-    Qt5::Test
+    Qt::Test
     kwin
     Wayland::Client
 
@@ -44,12 +44,12 @@ function(integrationTest)
     set(multiValueArgs SRCS LIBS)
     cmake_parse_arguments(ARGS "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     add_executable(${ARGS_NAME} ${ARGS_SRCS})
-    target_link_libraries(${ARGS_NAME} KWinIntegrationTestFramework kwin Qt5::Test ${ARGS_LIBS})
+    target_link_libraries(${ARGS_NAME} KWinIntegrationTestFramework kwin Qt::Test ${ARGS_LIBS})
     add_test(NAME kwin-${ARGS_NAME} COMMAND dbus-run-session ${CMAKE_BINARY_DIR}/bin/${ARGS_NAME})
     if (${ARGS_WAYLAND_ONLY})
         add_executable(${ARGS_NAME}_waylandonly ${ARGS_SRCS} )
         set_target_properties(${ARGS_NAME}_waylandonly PROPERTIES COMPILE_DEFINITIONS "NO_XWAYLAND")
-        target_link_libraries(${ARGS_NAME}_waylandonly KWinIntegrationTestFramework kwin Qt5::Test ${ARGS_LIBS})
+        target_link_libraries(${ARGS_NAME}_waylandonly KWinIntegrationTestFramework kwin Qt::Test ${ARGS_LIBS})
         add_test(NAME kwin-${ARGS_NAME}-waylandonly COMMAND dbus-run-session ${CMAKE_BINARY_DIR}/bin/${ARGS_NAME}_waylandonly)
     endif()
 endfunction()

autotests/integration/fakes/org.kde.kdecoration2/CMakeLists.txt

@@ -7,8 +7,8 @@ set_target_properties(fakedecoshadows PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/fakes/org.kde.kdecoration2")
 target_link_libraries(fakedecoshadows
     PUBLIC
-        Qt5::Core
-        Qt5::Gui
+        Qt::Core
+        Qt::Gui
     PRIVATE
         KDecoration2::KDecoration
         KF5::CoreAddons)

autotests/integration/helper/CMakeLists.txt

@@ -1,11 +1,11 @@
 add_executable(copy copy.cpp)
-target_link_libraries(copy Qt5::Gui)
+target_link_libraries(copy Qt::Gui)
 ecm_mark_as_test(copy)
 ######################
 add_executable(paste paste.cpp)
-target_link_libraries(paste Qt5::Gui)
+target_link_libraries(paste Qt::Gui)
 ecm_mark_as_test(paste)
 ######################
 add_executable(kill kill.cpp)
-target_link_libraries(kill Qt5::Widgets)
+target_link_libraries(kill Qt::Widgets)
 ecm_mark_as_test(kill)

autotests/libinput/CMakeLists.txt

@@ -1,13 +1,13 @@
 include_directories(${Libinput_INCLUDE_DIRS})
 
 add_library(LibInputTestObjects STATIC ../../libinput/device.cpp ../../libinput/events.cpp mock_libinput.cpp)
-target_link_libraries(LibInputTestObjects Qt5::Test Qt5::Widgets Qt5::DBus Qt5::Gui KF5::ConfigCore)
+target_link_libraries(LibInputTestObjects Qt::Test Qt::Widgets Qt::DBus Qt::Gui KF5::ConfigCore)
 
 ########################################################
 # Test Devices
 ########################################################
 add_executable(testLibinputDevice device_test.cpp)
-target_link_libraries(testLibinputDevice Qt5::Test Qt5::DBus Qt5::Gui KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputDevice Qt::Test Qt::DBus Qt::Gui KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputDevice COMMAND testLibinputDevice)
 ecm_mark_as_test(testLibinputDevice)
 
@@ -15,7 +15,7 @@ ecm_mark_as_test(testLibinputDevice)
 # Test Key Event
 ########################################################
 add_executable(testLibinputKeyEvent key_event_test.cpp)
-target_link_libraries(testLibinputKeyEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputKeyEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputKeyEvent COMMAND testLibinputKeyEvent)
 ecm_mark_as_test(testLibinputKeyEvent)
 
@@ -23,7 +23,7 @@ ecm_mark_as_test(testLibinputKeyEvent)
 # Test Pointer Event
 ########################################################
 add_executable(testLibinputPointerEvent pointer_event_test.cpp)
-target_link_libraries(testLibinputPointerEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputPointerEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputPointerEvent COMMAND testLibinputPointerEvent)
 ecm_mark_as_test(testLibinputPointerEvent)
 
@@ -31,7 +31,7 @@ ecm_mark_as_test(testLibinputPointerEvent)
 # Test Touch Event
 ########################################################
 add_executable(testLibinputTouchEvent touch_event_test.cpp)
-target_link_libraries(testLibinputTouchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputTouchEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputTouchEvent COMMAND testLibinputTouchEvent)
 ecm_mark_as_test(testLibinputTouchEvent)
 
@@ -39,7 +39,7 @@ ecm_mark_as_test(testLibinputTouchEvent)
 # Test Gesture Event
 ########################################################
 add_executable(testLibinputGestureEvent gesture_event_test.cpp)
-target_link_libraries(testLibinputGestureEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputGestureEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputGestureEvent COMMAND testLibinputGestureEvent)
 ecm_mark_as_test(testLibinputGestureEvent)
 
@@ -47,7 +47,7 @@ ecm_mark_as_test(testLibinputGestureEvent)
 # Test Switch Event
 ########################################################
 add_executable(testLibinputSwitchEvent switch_event_test.cpp)
-target_link_libraries(testLibinputSwitchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testLibinputSwitchEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputSwitchEvent COMMAND testLibinputSwitchEvent)
 ecm_mark_as_test(testLibinputSwitchEvent)
 
@@ -65,9 +65,9 @@ add_executable(testLibinputContext ${testLibinputContext_SRCS})
 target_link_libraries(testLibinputContext
     LibInputTestObjects
 
-    Qt5::DBus
-    Qt5::Test
-    Qt5::Widgets
+    Qt::DBus
+    Qt::Test
+    Qt::Widgets
 
     KF5::ConfigCore
     KF5::WindowSystem
@@ -79,6 +79,6 @@ ecm_mark_as_test(testLibinputContext)
 # Test Input Events
 ########################################################
 add_executable(testInputEvents input_event_test.cpp ../../input_event.cpp)
-target_link_libraries(testInputEvents Qt5::Test Qt5::DBus Qt5::Gui Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
+target_link_libraries(testInputEvents Qt::Test Qt::DBus Qt::Gui Qt::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testInputEvents COMMAND testInputEvents)
 ecm_mark_as_test(testInputEvents)

autotests/libkwineffects/CMakeLists.txt

@@ -4,7 +4,7 @@ macro(KWINEFFECTS_UNIT_TESTS)
    foreach(_testname ${ARGN})
       add_executable(${_testname} ${_testname}.cpp)
       add_test(NAME kwineffects-${_testname} COMMAND ${_testname})
-      target_link_libraries(${_testname} Qt5::Test kwineffects)
+      target_link_libraries(${_testname} Qt::Test kwineffects)
       ecm_mark_as_test(${_testname})
    endforeach()
 endmacro()
@@ -16,5 +16,5 @@ kwineffects_unit_tests(
 
 add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../libkwineffects/kwinglplatform.cpp)
 add_test(NAME kwineffects-kwinglplatformtest COMMAND kwinglplatformtest)
-target_link_libraries(kwinglplatformtest Qt5::Test Qt5::Gui Qt5::X11Extras KF5::ConfigCore XCB::XCB)
+target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui Qt::X11Extras KF5::ConfigCore XCB::XCB)
 ecm_mark_as_test(kwinglplatformtest)

autotests/libxrenderutils/CMakeLists.txt

@@ -3,9 +3,9 @@ set_target_properties(blendPictureTest PROPERTIES COMPILE_DEFINITIONS "NO_NONE_W
 add_test(NAME xrenderutils-blendPictureTest COMMAND blendPictureTest)
 target_link_libraries(blendPictureTest
     kwinxrenderutils
-    Qt5::Test
-    Qt5::Gui
-    Qt5::X11Extras
+    Qt::Test
+    Qt::Gui
+    Qt::X11Extras
     XCB::XCB
     XCB::RENDER
     XCB::XFIXES

autotests/tabbox/CMakeLists.txt

@@ -17,13 +17,13 @@ set(testTabBoxClientModel_SRCS
 add_executable(testTabBoxClientModel ${testTabBoxClientModel_SRCS})
 set_target_properties(testTabBoxClientModel PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 target_link_libraries(testTabBoxClientModel
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::Script
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Core
+    Qt::DBus
+    Qt::Quick
+    Qt::Script
+    Qt::Test
+    Qt::Widgets
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::I18n
@@ -53,13 +53,13 @@ set(testTabBoxHandler_SRCS
 add_executable(testTabBoxHandler ${testTabBoxHandler_SRCS})
 set_target_properties(testTabBoxHandler PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 target_link_libraries(testTabBoxHandler
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::Script
-    Qt5::Test
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Core
+    Qt::DBus
+    Qt::Quick
+    Qt::Script
+    Qt::Test
+    Qt::Widgets
+    Qt::X11Extras
 
     KF5::ConfigCore
     KF5::I18n
@@ -82,7 +82,7 @@ set(testTabBoxConfig_SRCS
 )
 
 add_executable(testTabBoxConfig ${testTabBoxConfig_SRCS})
-target_link_libraries(testTabBoxConfig Qt5::Core Qt5::Test)
+target_link_libraries(testTabBoxConfig Qt::Core Qt::Test)
 add_test(NAME kwin-testTabBoxConfig COMMAND testTabBoxConfig)
 ecm_mark_as_test(testTabBoxConfig)
 
@@ -97,6 +97,6 @@ set(testDesktopChain_SRCS
 )
 
 add_executable(testDesktopChain ${testDesktopChain_SRCS})
-target_link_libraries(testDesktopChain Qt5::Core Qt5::Test)
+target_link_libraries(testDesktopChain Qt::Core Qt::Test)
 add_test(NAME kwin-testDesktopChain COMMAND testDesktopChain)
 ecm_mark_as_test(testDesktopChain)

data/CMakeLists.txt

@@ -4,8 +4,8 @@ add_subdirectory(icons)
 add_executable(kwin5_update_default_rules update_default_rules.cpp)
 target_link_libraries(kwin5_update_default_rules
     KF5::ConfigCore
-    Qt5::Core
-    Qt5::DBus
+    Qt::Core
+    Qt::DBus
 )
 install(TARGETS kwin5_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/)
 

effects/CMakeLists.txt

@@ -31,10 +31,10 @@ if (HAVE_ACCESSIBILITY)
 endif()
 
 set(kwin_effect_QT_LIBS
-    Qt5::Concurrent
-    Qt5::DBus
-    Qt5::Quick
-    Qt5::X11Extras
+    Qt::Concurrent
+    Qt::DBus
+    Qt::Quick
+    Qt::X11Extras
 )
 
 set(kwin_effect_XLIB_LIBS

effects/blur/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_blur_config MODULE ${kwin_blur_config_SRCS})
 target_link_libraries(kwin_blur_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/coverswitch/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(kwin_coverswitch_config MODULE ${kwin_coverswitch_config_SRCS})
 target_link_libraries(kwin_coverswitch_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/desktopgrid/CMakeLists.txt

@@ -16,7 +16,7 @@ target_link_libraries(kwin_desktopgrid_config
     KF5::GlobalAccel
     KF5::I18n
     KF5::XmlGui
-    Qt5::Quick
+    Qt::Quick
     kwineffects
     KWinEffectsInterface
 )

effects/diminactive/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_diminactive_config MODULE ${kwin_diminactive_config_SRCS})
 target_link_libraries(kwin_diminactive_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/glide/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_glide_config MODULE ${kwin_glide_config_SRCS})
 target_link_libraries(kwin_glide_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/magiclamp/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_magiclamp_config MODULE ${kwin_magiclamp_config_SRCS})
 target_link_libraries(kwin_magiclamp_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/resize/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_resize_config MODULE ${kwin_resize_config_SRCS})
 target_link_libraries(kwin_resize_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/showfps/CMakeLists.txt

@@ -10,7 +10,7 @@ target_link_libraries(kwin_showfps_config
     KF5::Completion
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/slide/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_slide_config MODULE ${kwin_slide_config_SRCS})
 target_link_libraries(kwin_slide_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

effects/wobblywindows/CMakeLists.txt

@@ -9,7 +9,7 @@ add_library(kwin_wobblywindows_config MODULE ${kwin_wobblywindows_config_SRCS})
 target_link_libraries(kwin_wobblywindows_config
     KF5::ConfigWidgets
     KF5::I18n
-    Qt5::DBus
+    Qt::DBus
     KWinEffectsInterface
 )
 

helpers/killer/CMakeLists.txt

@@ -8,8 +8,8 @@ target_link_libraries(kwin_killer_helper
     KF5::AuthCore
     KF5::I18n
     KF5::WidgetsAddons
-    Qt5::Widgets
-    Qt5::X11Extras
+    Qt::Widgets
+    Qt::X11Extras
 )
 
 install(TARGETS kwin_killer_helper DESTINATION ${LIBEXEC_INSTALL_DIR})

kcmkwin/common/CMakeLists.txt

@@ -14,8 +14,8 @@ qt5_add_dbus_interface(kcmkwincommon_SRC
 add_library(kcmkwincommon SHARED ${kcmkwincommon_SRC})
 
 target_link_libraries(kcmkwincommon
-    Qt5::Core
-    Qt5::DBus
+    Qt::Core
+    Qt::DBus
     KF5::CoreAddons
     KF5::ConfigCore
     KF5::I18n

kcmkwin/kwincompositing/CMakeLists.txt

@@ -24,8 +24,8 @@ ki18n_wrap_ui(kwincompositing_SRC compositing.ui)
 add_library(kwincompositing MODULE ${kwincompositing_SRC})
 
 target_link_libraries(kwincompositing
-    Qt5::DBus
-    Qt5::Widgets
+    Qt::DBus
+    Qt::Widgets
 
     KF5::ConfigCore
     KF5::CoreAddons

kcmkwin/kwindecoration/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(kcm_kwindecoration
     KF5::KCMUtils
     KF5::NewStuff
     KF5::QuickAddons
-    Qt5::Quick
+    Qt::Quick
 )
 
 kcoreaddons_desktop_to_json(kcm_kwindecoration "kwindecoration.desktop" SERVICE_TYPES kcmodule.desktop)

kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt

@@ -14,8 +14,8 @@ add_library(kdecorationprivatedeclarative SHARED ${plugin_SRCS})
 target_link_libraries(kdecorationprivatedeclarative
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
-    Qt5::DBus
-    Qt5::Quick
+    Qt::DBus
+    Qt::Quick
     KF5::CoreAddons
     KF5::ConfigWidgets
     KF5::I18n

kcmkwin/kwindesktop/CMakeLists.txt

@@ -18,7 +18,7 @@ kconfig_add_kcfg_files(kcm_kwin_virtualdesktops_PART_SRCS virtualdesktopssetting
 add_library(kcm_kwin_virtualdesktops MODULE ${kcm_kwin_virtualdesktops_PART_SRCS})
 
 target_link_libraries(kcm_kwin_virtualdesktops
-    Qt5::DBus
+    Qt::DBus
 
     KF5::I18n
     KF5::KCMUtils

kcmkwin/kwineffects/CMakeLists.txt

@@ -14,7 +14,7 @@ set(kcm_kwin_effects_PART_SRCS
 add_library(kcm_kwin_effects MODULE ${kcm_kwin_effects_PART_SRCS})
 
 target_link_libraries(kcm_kwin_effects
-    Qt5::DBus
+    Qt::DBus
 
     KF5::I18n
     KF5::KCMUtils

kcmkwin/kwinoptions/CMakeLists.txt

@@ -22,7 +22,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings
 
 qt5_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
 add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
-target_link_libraries(kcm_kwinoptions kwin Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
+target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
 install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 ########### install files ###############

kcmkwin/kwinrules/CMakeLists.txt

@@ -30,8 +30,8 @@ set(kwin_kcm_rules_XCB_LIBS
 )
 
 set(kcm_libs
-    Qt5::Quick
-    Qt5::QuickWidgets
+    Qt::Quick
+    Qt::QuickWidgets
 
     KF5::I18n
     KF5::QuickAddons

kcmkwin/kwinscreenedges/CMakeLists.txt

@@ -26,7 +26,7 @@ ki18n_wrap_ui(kcm_kwinscreenedges_PART_SRCS main.ui)
 kconfig_add_kcfg_files(kcm_kwinscreenedges_PART_SRCS kwinscreenedgesettings.kcfgc kwinscreenedgescriptsettings.kcfgc)
 add_library(kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS})
 set(kcm_screenedges_LIBS
-    Qt5::DBus
+    Qt::DBus
 
     KF5::Completion
     KF5::ConfigCore

kcmkwin/kwinscripts/CMakeLists.txt

@@ -15,7 +15,7 @@ ki18n_wrap_ui(kcm_SRCS module.ui)
 add_library(kcm_kwin_scripts MODULE ${kcm_SRCS})
 
 target_link_libraries(kcm_kwin_scripts
-    Qt5::DBus
+    Qt::DBus
 
     KF5::I18n
     KF5::KCMUtils

kcmkwin/kwintabbox/CMakeLists.txt

@@ -21,7 +21,7 @@ kconfig_add_kcfg_files(kcm_kwintabbox_PART_SRCS kwintabboxsettings.kcfgc kwinswi
 add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS})
 
 target_link_libraries(kcm_kwintabbox
-    Qt5::Quick
+    Qt::Quick
 
     KF5::Completion
     KF5::GlobalAccel

libkwineffects/CMakeLists.txt

@@ -18,8 +18,8 @@ add_library(kwinxrenderutils SHARED ${kwin_XRENDERUTILS_SRCS})
 generate_export_header(kwinxrenderutils EXPORT_FILE_NAME kwinxrenderutils_export.h)
 target_link_libraries(kwinxrenderutils
     PUBLIC
-        Qt5::Core
-        Qt5::Gui
+        Qt::Core
+        Qt::Gui
 
         XCB::RENDER
         XCB::XCB
@@ -53,7 +53,7 @@ target_link_libraries(kwineffects
         XCB::XCB
         Plasma::KWaylandServer
     PRIVATE
-        Qt5::Quick
+        Qt::Quick
         KF5::Declarative
         kwinglutils
 )

platformsupport/scenes/opengl/CMakeLists.txt

@@ -20,5 +20,5 @@ ecm_qt_declare_logging_category(SCENE_OPENGL_BACKEND_SRCS
 )
 
 add_library(SceneOpenGLBackend STATIC ${SCENE_OPENGL_BACKEND_SRCS})
-target_link_libraries(SceneOpenGLBackend Qt5::Core Qt5::Widgets KF5::CoreAddons KF5::ConfigCore KF5::WindowSystem Plasma::KWaylandServer)
+target_link_libraries(SceneOpenGLBackend Qt::Core Qt::Widgets KF5::CoreAddons KF5::ConfigCore KF5::WindowSystem Plasma::KWaylandServer)
 target_include_directories(SceneOpenGLBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

platformsupport/scenes/qpainter/CMakeLists.txt

@@ -13,5 +13,5 @@ ecm_qt_declare_logging_category(SCENE_QPAINTER_BACKEND_SRCS
 )
 
 add_library(SceneQPainterBackend STATIC ${SCENE_QPAINTER_BACKEND_SRCS})
-target_link_libraries(SceneQPainterBackend Qt5::Core)
+target_link_libraries(SceneQPainterBackend Qt::Core)
 target_include_directories(SceneQPainterBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

platformsupport/scenes/xrender/CMakeLists.txt

@@ -8,5 +8,5 @@ ecm_qt_declare_logging_category(xrenderbackend_SOURCES
 )
 
 add_library(SceneXRenderBackend STATIC ${xrenderbackend_SOURCES})
-target_link_libraries(SceneXRenderBackend kwin Qt5::Core Qt5::Gui)
+target_link_libraries(SceneXRenderBackend kwin Qt::Core Qt::Gui)
 target_include_directories(SceneXRenderBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

platformsupport/vsyncconvenience/CMakeLists.txt

@@ -4,5 +4,5 @@ set(vsyncconvenience_SOURCES
 )
 
 add_library(VsyncSupport OBJECT ${vsyncconvenience_SOURCES})
-target_link_libraries(VsyncSupport Qt5::Core Qt5::Gui)
+target_link_libraries(VsyncSupport Qt::Core Qt::Gui)
 target_include_directories(VsyncSupport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

plugins/kdecorations/aurorae/src/CMakeLists.txt

@@ -22,8 +22,8 @@ target_link_libraries(kwin5_aurorae
     KF5::I18n
     KF5::Package
     KF5::WindowSystem
-    Qt5::Quick
-    Qt5::UiTools
+    Qt::Quick
+    Qt::UiTools
 )
 
 install(TARGETS kwin5_aurorae DESTINATION ${KDE_INSTALL_PLUGINDIR}/org.kde.kdecoration2)
@@ -39,7 +39,7 @@ set_target_properties(decorationplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CM
 target_link_libraries(decorationplugin
     KDecoration2::KDecoration
     KF5::ConfigWidgets
-    Qt5::Quick
+    Qt::Quick
 )
 install(TARGETS decorationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decoration)
 

plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt

@@ -5,7 +5,7 @@ set(plastik_plugin_SRCS
 
 add_library(plastikplugin SHARED ${plastik_plugin_SRCS})
 set_target_properties(plastikplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik")
-target_link_libraries(plastikplugin Qt5::Core Qt5::Quick KF5::ConfigWidgets)
+target_link_libraries(plastikplugin Qt::Core Qt::Quick KF5::ConfigWidgets)
 install(TARGETS plastikplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
 file(COPY qmldir DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik)

plugins/platforms/x11/standalone/CMakeLists.txt

@@ -20,7 +20,7 @@ set(X11PLATFORM_SOURCES
 
 add_library(KWinX11Platform MODULE ${X11PLATFORM_SOURCES})
 set_target_properties(KWinX11Platform PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.platforms/")
-target_link_libraries(KWinX11Platform eglx11common kwin kwinxrenderutils SceneOpenGLBackend VsyncSupport Qt5::X11Extras XCB::CURSOR KF5::Crash X11::X11)
+target_link_libraries(KWinX11Platform eglx11common kwin kwinxrenderutils SceneOpenGLBackend VsyncSupport Qt::X11Extras XCB::CURSOR KF5::Crash X11::X11)
 if (X11_Xi_FOUND)
     target_sources(KWinX11Platform PRIVATE xinputintegration.cpp)
     target_link_libraries(KWinX11Platform X11::Xi)

plugins/qpa/CMakeLists.txt

@@ -22,9 +22,9 @@ target_include_directories(KWinQpaPlugin PRIVATE
 )
 
 target_link_libraries(KWinQpaPlugin PRIVATE
-    Qt5::FontDatabaseSupportPrivate
-    Qt5::ThemeSupportPrivate
-    Qt5::EventDispatcherSupportPrivate
+    Qt::FontDatabaseSupportPrivate
+    Qt::ThemeSupportPrivate
+    Qt::EventDispatcherSupportPrivate
     Freetype::Freetype # Must be after Qt5 platform support libs
     Fontconfig::Fontconfig
     kwin

scripting/CMakeLists.txt

@@ -5,7 +5,7 @@ target_link_libraries(kcm_kwin4_genericscripted
     KF5::ConfigWidgets #KCModule
     KF5::I18n
     KF5::Service
-    Qt5::DBus
-    Qt5::UiTools
+    Qt::DBus
+    Qt::UiTools
 )
 install(TARGETS kcm_kwin4_genericscripted DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs)

tests/CMakeLists.txt

@@ -7,7 +7,7 @@ endif()
 # next target
 set(screenedgeshowtest_SRCS screenedgeshowtest.cpp)
 add_executable(screenedgeshowtest ${screenedgeshowtest_SRCS})
-target_link_libraries(screenedgeshowtest Qt5::Widgets Qt5::X11Extras KF5::ConfigCore KF5::WindowSystem KF5::WaylandClient ${XCB_XCB_LIBRARY})
+target_link_libraries(screenedgeshowtest Qt::Widgets Qt::X11Extras KF5::ConfigCore KF5::WindowSystem KF5::WaylandClient ${XCB_XCB_LIBRARY})
 
 set(libinputtest_SRCS
     ${KWin_SOURCE_DIR}/libinput/connection.cpp
@@ -21,20 +21,20 @@ set(libinputtest_SRCS
 )
 add_executable(libinputtest ${libinputtest_SRCS})
 add_definitions(-DKWIN_BUILD_TESTING)
-target_link_libraries(libinputtest Qt5::Core Qt5::DBus Libinput::Libinput UDev::UDev KF5::ConfigCore KF5::GlobalAccel KF5::WindowSystem)
+target_link_libraries(libinputtest Qt::Core Qt::DBus Libinput::Libinput UDev::UDev KF5::ConfigCore KF5::GlobalAccel KF5::WindowSystem)
 
 add_executable(x11shadowreader x11shadowreader.cpp)
-target_link_libraries(x11shadowreader XCB::XCB Qt5::Widgets Qt5::X11Extras KF5::ConfigCore KF5::WindowSystem)
+target_link_libraries(x11shadowreader XCB::XCB Qt::Widgets Qt::X11Extras KF5::ConfigCore KF5::WindowSystem)
 
 add_executable(pointerconstraints pointerconstraintstest.cpp)
 add_definitions(-DDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-target_link_libraries(pointerconstraints XCB::XCB Qt5::Gui Qt5::Quick KF5::WaylandClient)
+target_link_libraries(pointerconstraints XCB::XCB Qt::Gui Qt::Quick KF5::WaylandClient)
 
 add_executable(pointergestures pointergesturestest.cpp)
 add_definitions(-DDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-target_link_libraries(pointergestures Qt5::Gui Qt5::Quick KF5::WaylandClient)
+target_link_libraries(pointergestures Qt::Gui Qt::Quick KF5::WaylandClient)
 
 add_executable(cursorhotspottest cursorhotspottest.cpp)
-target_link_libraries(cursorhotspottest Qt5::Widgets)
+target_link_libraries(cursorhotspottest Qt::Widgets)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})