Define X-KDE-ConfigModule for KCMs instead of KServiceTypeTrader querying

Also we do not need to embed the json metadata.

CMakeLists.txt

@@ -9,7 +9,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
 project(krdc VERSION ${RELEASE_SERVICE_VERSION})
 
 set (QT_MIN_VERSION "5.15.0")
-set (KF5_MIN_VERSION "5.89.0")
+set (KF5_MIN_VERSION "5.90.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})

rdp/CMakeLists.txt

@@ -30,8 +30,6 @@ target_link_libraries(krdc_rdpplugin
 
 add_library(kcm_krdc_rdpplugin)
 
-kcoreaddons_desktop_to_json(kcm_krdc_rdpplugin krdc_rdp_config.desktop)
-
 target_sources(kcm_krdc_rdpplugin PRIVATE
     rdppreferences.cpp
 )
@@ -51,6 +49,4 @@ add_dependencies(kcm_krdc_rdpplugin krdc_rdpplugin)
 install(TARGETS kcm_krdc_rdpplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/krdc/kcms)
 install(TARGETS krdc_rdpplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/krdc)
 
-install(FILES krdc_rdp_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-
 install(FILES smb2rdc.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)

rdp/krdc_rdp.desktop

@@ -118,5 +118,6 @@ X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-Library=krdc_rdpplugin
 X-KDE-PluginInfo-Name=krdc_rdpplugin
+X-KDE-ConfigModule=krdc/kcms/kcm_krdc_rdpplugin
 
 X-KDE-KRDC-Sorting=60

rdp/krdc_rdp_config.desktop

-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=KCModule
-Name=RDP
-Name[bg]=RDP
-Name[bs]=RDP
-Name[ca]=RDP
-Name[ca@valencia]=RDP
-Name[cs]=RDP
-Name[da]=RDP
-Name[de]=RDP
-Name[el]=RDP
-Name[en_GB]=RDP
-Name[eo]=RDP
-Name[es]=RDP
-Name[et]=RDP
-Name[eu]=RDP
-Name[fi]=RDP
-Name[fr]=RDP
-Name[ga]=RDP
-Name[gl]=RDP
-Name[hr]=RDP
-Name[hu]=RDP
-Name[ia]=RDP
-Name[is]=RDP
-Name[it]=RDP
-Name[ja]=RDP
-Name[kk]=RDP
-Name[km]=RDP
-Name[ko]=RDP
-Name[lt]=RDP
-Name[lv]=RDP
-Name[mr]=आर-डी-पी
-Name[nb]=RDP
-Name[nds]=RDP
-Name[nl]=RDP
-Name[nn]=RDP
-Name[pa]=RDP
-Name[pl]=RDP
-Name[pt]=RDP
-Name[pt_BR]=RDP
-Name[ro]=RDP
-Name[ru]=Базовая программа RDP
-Name[si]=RDP
-Name[sk]=RDP
-Name[sl]=RDP
-Name[sr]=РДП
-Name[sr@ijekavian]=РДП
-Name[sr@ijekavianlatin]=RDP
-Name[sr@latin]=RDP
-Name[sv]=RDP
-Name[tr]=RDP
-Name[ug]=RDP
-Name[uk]=RDP
-Name[wa]=RDP
-Name[x-test]=xxRDPxx
-Name[zh_CN]=RDP
-Name[zh_TW]=RDP
-
-X-KDE-Library=krdc/kcms/kcm_krdc_rdpplugin
-X-KDE-ParentComponents=krdc_rdpplugin

rdp/rdppreferences.cpp

@@ -10,7 +10,7 @@
 
 #include "ui_rdppreferences.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(KrdcKcmFactory, "krdc_rdp_config.json", registerPlugin<RdpPreferences>();)
+K_PLUGIN_CLASS(RdpPreferences)
 
 RdpPreferences::RdpPreferences(QWidget *parent, const QVariantList &args)
         : KCModule(parent, args)

vnc/CMakeLists.txt

@@ -47,8 +47,6 @@ target_sources(kcm_krdc_vncplugin PRIVATE
     vncpreferences.cpp
 )
 
-kcoreaddons_desktop_to_json(kcm_krdc_vncplugin krdc_vnc_config.desktop)
-
 if (LIBSSH_FOUND)
     target_compile_definitions(kcm_krdc_vncplugin PRIVATE -DLIBSSH_FOUND)
 endif()
@@ -68,5 +66,3 @@ add_dependencies(kcm_krdc_vncplugin krdc_vncplugin)
 
 install(TARGETS kcm_krdc_vncplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/krdc/kcms)
 install(TARGETS krdc_vncplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/krdc)
-
-install(FILES krdc_vnc_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})

vnc/krdc_vnc.desktop

@@ -116,5 +116,6 @@ X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-Library=krdc_vncplugin
 X-KDE-PluginInfo-Name=krdc_vncplugin
+X-KDE-ConfigModule=krdc/kcms/kcm_krdc_vncplugin
 
 X-KDE-KRDC-Sorting=20

vnc/krdc_vnc_config.desktop

-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=KCModule
-Name=VNC
-Name[bg]=VNC
-Name[bs]=VNC
-Name[ca]=VNC
-Name[ca@valencia]=VNC
-Name[cs]=VNC
-Name[da]=VNC
-Name[de]=VNC
-Name[el]=VNC
-Name[en_GB]=VNC
-Name[eo]=VNC
-Name[es]=VNC
-Name[et]=VNC
-Name[eu]=VNC
-Name[fi]=VNC
-Name[fr]=VNC
-Name[ga]=VNC
-Name[gl]=VNC
-Name[hr]=VNC
-Name[hu]=VNC
-Name[ia]=VNC
-Name[is]=VNC
-Name[it]=VNC
-Name[ja]=VNC
-Name[kk]=VNC
-Name[km]=VNC
-Name[ko]=VNC
-Name[lt]=VNC
-Name[lv]=VNC
-Name[nb]=VNC
-Name[nds]=VNC
-Name[nl]=VNC
-Name[nn]=VNC
-Name[pa]=VNC
-Name[pl]=VNC
-Name[pt]=VNC
-Name[pt_BR]=VNC
-Name[ro]=VNC
-Name[ru]=VNC
-Name[si]=VNC
-Name[sk]=VNC
-Name[sl]=VNC
-Name[sr]=ВНЦ
-Name[sr@ijekavian]=ВНЦ
-Name[sr@ijekavianlatin]=VNC
-Name[sr@latin]=VNC
-Name[sv]=VNC
-Name[tr]=VNC
-Name[ug]=VNC
-Name[uk]=VNC
-Name[wa]=VNC
-Name[x-test]=xxVNCxx
-Name[zh_CN]=VNC
-Name[zh_TW]=VNC
-
-X-KDE-Library=krdc/kcms/kcm_krdc_vncplugin
-X-KDE-ParentComponents=krdc_vncplugin

vnc/vncpreferences.cpp

@@ -10,7 +10,7 @@
 
 #include "ui_vncpreferences.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(KrdcKcmFactory, "krdc_vnc_config.json", registerPlugin<VncPreferences>();)
+K_PLUGIN_CLASS(VncPreferences)
 
 VncPreferences::VncPreferences(QWidget *parent, const QVariantList &args)
         : KCModule(parent, args)