diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 093df0258..364b26695 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -57,13 +57,13 @@ target_include_directories(kdeconnectcore PUBLIC ${PROJECT_SOURCE_DIR})
 
 target_link_libraries(kdeconnectcore
 PUBLIC
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
     KF${QT_MAJOR_VERSION}::CoreAddons
     ${Qca_LIBRARY}
     KF${QT_MAJOR_VERSION}::KIOCore
     KF${QT_MAJOR_VERSION}::KIOGui
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::I18n
     KF${QT_MAJOR_VERSION}::ConfigCore
 )
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 81b616362..71d5b1412 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -101,8 +101,8 @@ generate_export_header(kdeconnectinterfaces EXPORT_FILE_NAME ${CMAKE_CURRENT_BIN
 
 target_link_libraries(kdeconnectinterfaces
 LINK_PUBLIC
-    Qt${QT_MAJOR_VERSION}::Gui
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::Gui
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::ConfigCore
 LINK_PRIVATE
     kdeconnectcore
diff --git a/plugins/battery/CMakeLists.txt b/plugins/battery/CMakeLists.txt
index aaf549ff0..71068926f 100644
--- a/plugins/battery/CMakeLists.txt
+++ b/plugins/battery/CMakeLists.txt
@@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_battery
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin battery)")
 target_link_libraries(kdeconnect_battery
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::Solid
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/bigscreen/CMakeLists.txt b/plugins/bigscreen/CMakeLists.txt
index 79a0cb01d..4e6287c28 100644
--- a/plugins/bigscreen/CMakeLists.txt
+++ b/plugins/bigscreen/CMakeLists.txt
@@ -1,11 +1,7 @@
-set(kdeconnect_bigscreen_SRCS
-    bigscreenplugin.cpp
-)
-
-kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS})
+kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES bigscreenplugin.cpp)
 
 target_link_libraries(kdeconnect_bigscreen
     kdeconnectcore
     kdeconnectinterfaces
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::I18n)
diff --git a/plugins/clipboard/CMakeLists.txt b/plugins/clipboard/CMakeLists.txt
index 1359f3c23..05861f517 100644
--- a/plugins/clipboard/CMakeLists.txt
+++ b/plugins/clipboard/CMakeLists.txt
@@ -7,15 +7,14 @@ ecm_qt_declare_logging_category(kdeconnect_clipboard
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin clipboard)")
 
 target_link_libraries(kdeconnect_clipboard kdeconnectcore
-                                    KF${QT_MAJOR_VERSION}::GuiAddons
-                                    Qt${QT_MAJOR_VERSION}::DBus
-                                    ${kdeconnect_clipboard_WL_LINK_LIBS}
-                                    )
+    Qt::DBus
+    KF${QT_MAJOR_VERSION}::GuiAddons
+    ${kdeconnect_clipboard_WL_LINK_LIBS}
+)
 
-kcoreaddons_add_plugin(kdeconnect_clipboard_config INSTALL_NAMESPACE "kdeconnect/kcms")
+kcoreaddons_add_plugin(kdeconnect_clipboard_config SOURCES clipboard_config.cpp INSTALL_NAMESPACE "kdeconnect/kcms")
 
 ki18n_wrap_ui(kdeconnect_clipboard_config clipboard_config.ui)
-target_sources(kdeconnect_clipboard_config PRIVATE clipboard_config.cpp)
 target_link_libraries(kdeconnect_clipboard_config
     kdeconnectcore
     kdeconnectpluginkcm
diff --git a/plugins/connectivity-report/CMakeLists.txt b/plugins/connectivity-report/CMakeLists.txt
index 64bb81c62..8942809bf 100644
--- a/plugins/connectivity-report/CMakeLists.txt
+++ b/plugins/connectivity-report/CMakeLists.txt
@@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_connectivity_report
 
 target_link_libraries(kdeconnect_connectivity_report
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::Solid
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/mmtelephony/CMakeLists.txt b/plugins/mmtelephony/CMakeLists.txt
index bf7c25b56..1b466b784 100644
--- a/plugins/mmtelephony/CMakeLists.txt
+++ b/plugins/mmtelephony/CMakeLists.txt
@@ -8,7 +8,7 @@ ecm_qt_declare_logging_category(kdeconnect_mmtelephony
 
 target_link_libraries(kdeconnect_mmtelephony
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::ModemManagerQt
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/ping/CMakeLists.txt b/plugins/ping/CMakeLists.txt
index c9d9b2aba..503717c47 100644
--- a/plugins/ping/CMakeLists.txt
+++ b/plugins/ping/CMakeLists.txt
@@ -8,6 +8,6 @@ ecm_qt_declare_logging_category(kdeconnect_ping
 
 target_link_libraries(kdeconnect_ping
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/presenter/CMakeLists.txt b/plugins/presenter/CMakeLists.txt
index 51a7bc36d..c436fa78f 100644
--- a/plugins/presenter/CMakeLists.txt
+++ b/plugins/presenter/CMakeLists.txt
@@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(kdeconnect_presenter
 
 target_link_libraries(kdeconnect_presenter
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
-    Qt${QT_MAJOR_VERSION}::Quick
+    Qt::DBus
+    Qt::Quick
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/remotecommands/CMakeLists.txt b/plugins/remotecommands/CMakeLists.txt
index c5658204b..38d776c90 100644
--- a/plugins/remotecommands/CMakeLists.txt
+++ b/plugins/remotecommands/CMakeLists.txt
@@ -7,5 +7,5 @@ ecm_qt_declare_logging_category(kdeconnect_remotecommands
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecommands)")
 target_link_libraries(kdeconnect_remotecommands
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
 )
diff --git a/plugins/remotecontrol/CMakeLists.txt b/plugins/remotecontrol/CMakeLists.txt
index f70a94c5d..7a0fdb12f 100644
--- a/plugins/remotecontrol/CMakeLists.txt
+++ b/plugins/remotecontrol/CMakeLists.txt
@@ -7,6 +7,6 @@ ecm_qt_declare_logging_category(kdeconnect_remotecontrol
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecontrol)")
 target_link_libraries(kdeconnect_remotecontrol
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/remotesystemvolume/CMakeLists.txt b/plugins/remotesystemvolume/CMakeLists.txt
index 6a77a4e71..ce2eb69a0 100644
--- a/plugins/remotesystemvolume/CMakeLists.txt
+++ b/plugins/remotesystemvolume/CMakeLists.txt
@@ -7,6 +7,6 @@ ecm_qt_declare_logging_category(kdeconnect_remotesystemvolume
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotesystemvolume)")
 target_link_libraries(kdeconnect_remotesystemvolume
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::I18n
 )
diff --git a/plugins/runcommand/CMakeLists.txt b/plugins/runcommand/CMakeLists.txt
index 3bf00e827..381ad0ff1 100644
--- a/plugins/runcommand/CMakeLists.txt
+++ b/plugins/runcommand/CMakeLists.txt
@@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_runcommand
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin runcommand)")
 target_link_libraries(kdeconnect_runcommand
     kdeconnectcore
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF${QT_MAJOR_VERSION}::KCMUtils
     KF${QT_MAJOR_VERSION}::I18n)