diff --git a/appmenu/CMakeLists.txt b/appmenu/CMakeLists.txt
index d6a62e7be..722296929 100644
--- a/appmenu/CMakeLists.txt
+++ b/appmenu/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_add_dbus_adaptor(kded_appmenu_SRCS com.canonical.AppMenu.Registrar.xml
 qt_add_dbus_adaptor(kded_appmenu_SRCS org.kde.kappmenu.xml
     appmenu_dbus.h AppmenuDBus appmenuadaptor AppmenuAdaptor)
 
-kcoreaddons_add_plugin(appmenu SOURCES ${kded_appmenu_SRCS} INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(appmenu SOURCES ${kded_appmenu_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 
 pkg_check_modules(XKBCommon REQUIRED IMPORTED_TARGET xkbcommon)
 
diff --git a/cmake/FindKIOExtras.cmake b/cmake/FindKIOExtras.cmake
index fe6622d6c..635968cb3 100644
--- a/cmake/FindKIOExtras.cmake
+++ b/cmake/FindKIOExtras.cmake
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2021 Alexander Lohnau <alexander.lohnau@gmx.de>
 # SPDX-License-Identifier: BSD-3-Clause
 
-find_path(KIOExtras_PATH thumbnail.so PATHS ${KDE_INSTALL_FULL_PLUGINDIR}/kf5/kio/)
+find_path(KIOExtras_PATH thumbnail.so PATHS ${KDE_INSTALL_FULL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio/)
 
 if (KIOExtras_PATH)
     set(KIOExtras_FOUND TRUE)
diff --git a/freespacenotifier/CMakeLists.txt b/freespacenotifier/CMakeLists.txt
index 03aaa98c0..3a2ca834d 100644
--- a/freespacenotifier/CMakeLists.txt
+++ b/freespacenotifier/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_dbus_interface(kded_freespacenotifier_SRCS ${KDED_DBUS_INTERFACE} kded_in
 
 kconfig_add_kcfg_files(kded_freespacenotifier_SRCS settings.kcfgc)
 
-kcoreaddons_add_plugin(freespacenotifier SOURCES ${kded_freespacenotifier_SRCS} INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(freespacenotifier SOURCES ${kded_freespacenotifier_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 
 target_link_libraries(freespacenotifier
     KF5::ConfigWidgets
diff --git a/kcms/kfontinst/kio/CMakeLists.txt b/kcms/kfontinst/kio/CMakeLists.txt
index a91c2f3fb..4159b9a0d 100644
--- a/kcms/kfontinst/kio/CMakeLists.txt
+++ b/kcms/kfontinst/kio/CMakeLists.txt
@@ -4,7 +4,7 @@ ecm_qt_declare_logging_category(kio_fonts_PART_SRCS
     IDENTIFIER KCM_KFONTINST_KIO
     CATEGORY_NAME org.kde.kcm_kfontinst.kio)
 # qt_add_dbus_interface(kio_fonts_PART_SRCS ../dbus/org.kde.fontinst.xml FontinstIface)
-kcoreaddons_add_plugin(kio_fonts SOURCES ${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} INSTALL_NAMESPACE "kf5/kio")
+kcoreaddons_add_plugin(kio_fonts SOURCES ${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kio")
 target_link_libraries(kio_fonts Qt::DBus Qt::X11Extras Qt::Xml KF5::Archive KF5::KIOCore KF5::KIOWidgets kfontinst )
 install( FILES fonts.desktop  DESTINATION  ${KDE_INSTALL_DATADIR}/konqsidebartng/virtual_folders/services )
 ecm_install_icons( ICONS
diff --git a/kcms/kfontinst/viewpart/CMakeLists.txt b/kcms/kfontinst/viewpart/CMakeLists.txt
index a54033f23..c43a1bb7a 100644
--- a/kcms/kfontinst/viewpart/CMakeLists.txt
+++ b/kcms/kfontinst/viewpart/CMakeLists.txt
@@ -10,6 +10,6 @@ add_library(kfontviewpart MODULE ${kfontviewpart_PART_SRCS})
 
 target_link_libraries(kfontviewpart KF5::Archive KF5::Parts KF5::XmlGui kfontinstui kfontinst )
 
-install(TARGETS kfontviewpart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts )
+install(TARGETS kfontviewpart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts )
 
 install( FILES kfontviewpart.rc DESTINATION  ${KDE_INSTALL_KXMLGUIDIR}/kfontview )
diff --git a/kioslave/applications/CMakeLists.txt b/kioslave/applications/CMakeLists.txt
index 22495cf87..e235ea70c 100644
--- a/kioslave/applications/CMakeLists.txt
+++ b/kioslave/applications/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kio5_applications\")
 
-kcoreaddons_add_plugin(kio_applications SOURCES kio_applications.cpp INSTALL_NAMESPACE "kf5/kio")
+kcoreaddons_add_plugin(kio_applications SOURCES kio_applications.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kio")
 set_target_properties(kio_applications PROPERTIES OUTPUT_NAME "applications")
 
 target_link_libraries(kio_applications KF5::KIOCore KF5::I18n KF5::Service Qt::Network)
diff --git a/kioslave/desktop/CMakeLists.txt b/kioslave/desktop/CMakeLists.txt
index 7fa09d23b..72eb0a8fc 100644
--- a/kioslave/desktop/CMakeLists.txt
+++ b/kioslave/desktop/CMakeLists.txt
@@ -12,13 +12,13 @@ qt_add_dbus_interface( kio_desktop_SRCS ${CMAKE_CURRENT_BINARY_DIR}/desktopnotif
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-kcoreaddons_add_plugin(kio_desktop SOURCES ${kio_desktop_SRCS} INSTALL_NAMESPACE "kf5/kio")
+kcoreaddons_add_plugin(kio_desktop SOURCES ${kio_desktop_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kio")
 target_link_libraries(kio_desktop Qt::DBus Qt::Gui KF5::KIOCore KF5::I18n KF5::ConfigCore Qt::Network)
 set_target_properties(kio_desktop PROPERTIES OUTPUT_NAME "desktop")
 
 ########### next target ###############
 
-kcoreaddons_add_plugin(desktopnotifier SOURCES desktopnotifier.cpp INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(desktopnotifier SOURCES desktopnotifier.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 target_link_libraries(desktopnotifier KF5::ConfigCore KF5::KIOCore KF5::DBusAddons)
 
 ########### install files ###############
diff --git a/ktimezoned/CMakeLists.txt b/ktimezoned/CMakeLists.txt
index 86918a5f7..442cb7e1d 100644
--- a/ktimezoned/CMakeLists.txt
+++ b/ktimezoned/CMakeLists.txt
@@ -4,7 +4,7 @@ else ()
     set(kded_ktimezoned_SRCS ktimezoned.cpp)
 endif ()
 
-kcoreaddons_add_plugin(ktimezoned SOURCES ${kded_ktimezoned_SRCS} INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(ktimezoned SOURCES ${kded_ktimezoned_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 
 #qt_add_dbus_adaptor(kded_ktimezoned_SRCS org.kde.KTimeZoned ktimezonedbus.h DBusHandler)
 
diff --git a/libcolorcorrect/LibColorCorrectConfig.cmake.in b/libcolorcorrect/LibColorCorrectConfig.cmake.in
index 9dd47ad0f..e01f68a41 100644
--- a/libcolorcorrect/LibColorCorrectConfig.cmake.in
+++ b/libcolorcorrect/LibColorCorrectConfig.cmake.in
@@ -1,8 +1,8 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
-find_dependency(Qt5Quick "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Quick "@QT_MIN_VERSION@")
 find_dependency(KF5Plasma "@KF5_MIN_VERSION@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/LibColorCorrectLibraryTargets.cmake")
diff --git a/libcolorcorrect/kded/CMakeLists.txt b/libcolorcorrect/kded/CMakeLists.txt
index d271b411a..a4eba7e15 100644
--- a/libcolorcorrect/kded/CMakeLists.txt
+++ b/libcolorcorrect/kded/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/..)
 
-kcoreaddons_add_plugin(colorcorrectlocationupdater SOURCES locationupdater.cpp INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(colorcorrectlocationupdater SOURCES locationupdater.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 
 target_link_libraries(colorcorrectlocationupdater
                         KF5::DBusAddons
diff --git a/libnotificationmanager/LibNotificationManagerConfig.cmake.in b/libnotificationmanager/LibNotificationManagerConfig.cmake.in
index 5f2b04793..202c509e5 100644
--- a/libnotificationmanager/LibNotificationManagerConfig.cmake.in
+++ b/libnotificationmanager/LibNotificationManagerConfig.cmake.in
@@ -1,9 +1,9 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
-find_dependency(Qt5Gui "@QT_MIN_VERSION@")
-find_dependency(Qt5Quick "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Gui "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Quick "@QT_MIN_VERSION@")
 find_dependency(KF5ItemModels "@KF5_MIN_VERSION@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/LibNotificationManagerLibraryTargets.cmake")
diff --git a/libtaskmanager/LibTaskManagerConfig.cmake.in b/libtaskmanager/LibTaskManagerConfig.cmake.in
index 5222497e8..5f30a7fc8 100644
--- a/libtaskmanager/LibTaskManagerConfig.cmake.in
+++ b/libtaskmanager/LibTaskManagerConfig.cmake.in
@@ -1,9 +1,9 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
-find_dependency(Qt5Gui "@QT_MIN_VERSION@")
-find_dependency(Qt5Quick "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Gui "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Quick "@QT_MIN_VERSION@")
 find_dependency(KF5ItemModels "@KF5_MIN_VERSION@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/LibTaskManagerLibraryTargets.cmake")
diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index 038be32eb..14f78e274 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 
-find_package(Phonon4Qt5 4.6.60 NO_MODULE)
+find_package(Phonon4Qt${QT_MAJOR_VERSION} 4.6.60 NO_MODULE)
 include_directories(BEFORE ${PHONON_INCLUDES})
 
-if(Phonon4Qt5_FOUND)
+if(Phonon4Qt${QT_MAJOR_VERSION}_FOUND)
     add_subdirectory(platform_kde)
 endif()
diff --git a/runners/bookmarks/CMakeLists.txt b/runners/bookmarks/CMakeLists.txt
index 7f0774bdd..664c7245e 100644
--- a/runners/bookmarks/CMakeLists.txt
+++ b/runners/bookmarks/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_libraries(krunner_bookmarks_common
     KF5::Bookmarks
 )
 
-kcoreaddons_add_plugin(krunner_bookmarksrunner SOURCES bookmarksrunner.cpp browserfactory.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_bookmarksrunner SOURCES bookmarksrunner.cpp browserfactory.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_bookmarksrunner krunner_bookmarks_common)
 
 # Currently tests include only chrome, so no need to get include them if json is not found
diff --git a/runners/calculator/CMakeLists.txt b/runners/calculator/CMakeLists.txt
index 0b6ecfc04..669daca2f 100644
--- a/runners/calculator/CMakeLists.txt
+++ b/runners/calculator/CMakeLists.txt
@@ -21,7 +21,7 @@ set(krunner_calculatorrunner_SRCS
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
 kde_enable_exceptions()
 
-kcoreaddons_add_plugin(calculator SOURCES ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS} INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(calculator SOURCES ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(calculator
                       ${QALCULATE_LIBRARIES}
                       ${CLN_LIBRARIES}
diff --git a/runners/helprunner/CMakeLists.txt b/runners/helprunner/CMakeLists.txt
index 9b41eeb06..bf04d03ae 100644
--- a/runners/helprunner/CMakeLists.txt
+++ b/runners/helprunner/CMakeLists.txt
@@ -1,2 +1,2 @@
-kcoreaddons_add_plugin(helprunner SOURCES helprunner.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(helprunner SOURCES helprunner.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(helprunner Qt::Widgets KF5::I18n KF5::Runner KF5::KIOGui)
diff --git a/runners/kill/CMakeLists.txt b/runners/kill/CMakeLists.txt
index 6930d2d22..d296fd69f 100644
--- a/runners/kill/CMakeLists.txt
+++ b/runners/kill/CMakeLists.txt
@@ -5,7 +5,7 @@ set(kcm_krunner_kill_SRCS
 )
 
 ki18n_wrap_ui(kcm_krunner_kill_SRCS killrunner_config.ui)
-kcoreaddons_add_plugin(kcm_krunner_kill SOURCES ${kcm_krunner_kill_SRCS} INSTALL_NAMESPACE "kf5/krunner/kcms")
+kcoreaddons_add_plugin(kcm_krunner_kill SOURCES ${kcm_krunner_kill_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner/kcms")
 target_link_libraries(kcm_krunner_kill
     Qt::Core
     Qt::Gui
@@ -17,7 +17,7 @@ target_link_libraries(kcm_krunner_kill
     KF5::Runner
     )
 
-kcoreaddons_add_plugin(krunner_kill SOURCES killrunner.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_kill SOURCES killrunner.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_kill
                       KF5::I18n
                       KF5::Completion
diff --git a/runners/locations/CMakeLists.txt b/runners/locations/CMakeLists.txt
index 7070903c0..8bf3e6b94 100644
--- a/runners/locations/CMakeLists.txt
+++ b/runners/locations/CMakeLists.txt
@@ -4,7 +4,7 @@ set(krunner_locations_SRCS
     locationrunner.cpp
 )
 
-kcoreaddons_add_plugin(locations SOURCES ${krunner_locations_SRCS} INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(locations SOURCES ${krunner_locations_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(locations
     KF5::KIOCore
     KF5::KIOWidgets
diff --git a/runners/places/CMakeLists.txt b/runners/places/CMakeLists.txt
index 85200fa78..c2ed83f89 100644
--- a/runners/places/CMakeLists.txt
+++ b/runners/places/CMakeLists.txt
@@ -4,7 +4,7 @@ set(krunner_placesrunner_SRCS
     placesrunner.cpp
 )
 
-kcoreaddons_add_plugin(krunner_placesrunner SOURCES ${krunner_placesrunner_SRCS} INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_placesrunner SOURCES ${krunner_placesrunner_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_placesrunner
     KF5::KIOCore
     KF5::KIOFileWidgets
diff --git a/runners/powerdevil/CMakeLists.txt b/runners/powerdevil/CMakeLists.txt
index 09fa56c67..a84bd4225 100644
--- a/runners/powerdevil/CMakeLists.txt
+++ b/runners/powerdevil/CMakeLists.txt
@@ -8,5 +8,5 @@ set(krunner_powerdevil_SRCS
     PowerDevilRunner.cpp
 )
 
-kcoreaddons_add_plugin(krunner_powerdevil SOURCES ${krunner_powerdevil_SRCS} INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_powerdevil SOURCES ${krunner_powerdevil_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_powerdevil Qt::DBus KF5::ConfigCore KF5::I18n KF5::Plasma KF5::Runner PW::KWorkspace)
diff --git a/runners/recentdocuments/CMakeLists.txt b/runners/recentdocuments/CMakeLists.txt
index 9d94a1733..63d003a93 100644
--- a/runners/recentdocuments/CMakeLists.txt
+++ b/runners/recentdocuments/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_recentdocuments\")
 
-kcoreaddons_add_plugin(krunner_recentdocuments SOURCES recentdocuments.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_recentdocuments SOURCES recentdocuments.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_recentdocuments
     KF5::KIOCore
     KF5::KIOWidgets
diff --git a/runners/services/CMakeLists.txt b/runners/services/CMakeLists.txt
index 5a3012877..5df713e48 100644
--- a/runners/services/CMakeLists.txt
+++ b/runners/services/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(krunner_services_static
     KF5::Activities
 )
 
-kcoreaddons_add_plugin(krunner_services SOURCES plugin.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_services SOURCES plugin.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_services
     krunner_services_static
 )
diff --git a/runners/sessions/CMakeLists.txt b/runners/sessions/CMakeLists.txt
index ee027a849..8381ac0df 100644
--- a/runners/sessions/CMakeLists.txt
+++ b/runners/sessions/CMakeLists.txt
@@ -6,5 +6,5 @@ set(krunner_sessions_SRCS
 
 qt_add_dbus_interface(krunner_sessions_SRCS ${SCREENSAVER_DBUS_INTERFACE} screensaver_interface)
 
-kcoreaddons_add_plugin(krunner_sessions SOURCES ${krunner_sessions_SRCS} INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_sessions SOURCES ${krunner_sessions_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_sessions Qt::Widgets Qt::DBus KF5::Runner KF5::I18n PW::KWorkspace)
diff --git a/runners/shell/CMakeLists.txt b/runners/shell/CMakeLists.txt
index a2972b63e..503d62b97 100644
--- a/runners/shell/CMakeLists.txt
+++ b/runners/shell/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_shell\")
 
-kcoreaddons_add_plugin(krunner_shell SOURCES shellrunner.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_shell SOURCES shellrunner.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_shell
     KF5::KIOCore
     KF5::KIOGui
diff --git a/runners/webshortcuts/CMakeLists.txt b/runners/webshortcuts/CMakeLists.txt
index 582683142..c742b24b4 100644
--- a/runners/webshortcuts/CMakeLists.txt
+++ b/runners/webshortcuts/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_webshortcuts\")
 
-kcoreaddons_add_plugin(krunner_webshortcuts SOURCES webshortcutrunner.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_webshortcuts SOURCES webshortcutrunner.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_webshortcuts
   Qt::DBus
   KF5::Runner
diff --git a/runners/windowedwidgets/CMakeLists.txt b/runners/windowedwidgets/CMakeLists.txt
index 4b3deb4ce..ea00bd848 100644
--- a/runners/windowedwidgets/CMakeLists.txt
+++ b/runners/windowedwidgets/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_windowedwidgets\")
 
-kcoreaddons_add_plugin(krunner_windowedwidgets SOURCES windowedwidgetsrunner.cpp INSTALL_NAMESPACE "kf5/krunner")
+kcoreaddons_add_plugin(krunner_windowedwidgets SOURCES windowedwidgetsrunner.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/krunner")
 target_link_libraries(krunner_windowedwidgets KF5::Plasma KF5::I18n KF5::Runner)
diff --git a/soliduiserver/CMakeLists.txt b/soliduiserver/CMakeLists.txt
index 9628947d8..7aa70d902 100644
--- a/soliduiserver/CMakeLists.txt
+++ b/soliduiserver/CMakeLists.txt
@@ -1,7 +1,7 @@
 ########### next target ###############
 add_definitions(-DTRANSLATION_DOMAIN=\"soliduiserver5\")
 
-kcoreaddons_add_plugin(soliduiserver SOURCES soliduiserver.cpp INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(soliduiserver SOURCES soliduiserver.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 target_link_libraries(soliduiserver
     KF5::Solid
     KF5::DBusAddons
diff --git a/statusnotifierwatcher/CMakeLists.txt b/statusnotifierwatcher/CMakeLists.txt
index ee7abbde3..8910f63a0 100644
--- a/statusnotifierwatcher/CMakeLists.txt
+++ b/statusnotifierwatcher/CMakeLists.txt
@@ -14,5 +14,5 @@ set_source_files_properties(${statusnotifieritem_xml} PROPERTIES
 )
 qt_add_dbus_interface(kded_statusnotifierwatcher_SRCS ${statusnotifieritem_xml} statusnotifieritem_interface)
 
-kcoreaddons_add_plugin(statusnotifierwatcher SOURCES ${kded_statusnotifierwatcher_SRCS} INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(statusnotifierwatcher SOURCES ${kded_statusnotifierwatcher_SRCS} INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 target_link_libraries(statusnotifierwatcher Qt::DBus KF5::DBusAddons KF5::CoreAddons)
diff --git a/systemmonitor/CMakeLists.txt b/systemmonitor/CMakeLists.txt
index 6004546cc..3115f13e3 100644
--- a/systemmonitor/CMakeLists.txt
+++ b/systemmonitor/CMakeLists.txt
@@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"systemmonitor\")
 
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
 
-kcoreaddons_add_plugin(ksysguard SOURCES kdedksysguard.cpp INSTALL_NAMESPACE "kf5/kded")
+kcoreaddons_add_plugin(ksysguard SOURCES kdedksysguard.cpp INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded")
 
 target_link_libraries(ksysguard
     KF5::DBusAddons