Use K_PLUGIN_CLASS_WITH_JSON install in pim/kcm/kaddressbook too

kcm/CMakeLists.txt

@@ -13,14 +13,8 @@ kconfig_add_kcfg_files(kcm_akonadicontact_actions ${Akonadi-Contact_SOURCE_DIR}/
 
 
 
-#kcoreaddons_desktop_to_json(kcm_akonadicontact_actions akonadicontact_actions.desktop DEFAULT_SERVICE_TYPE)
+install(FILES akonadicontact_actions.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+kcoreaddons_desktop_to_json(kcm_akonadicontact_actions akonadicontact_actions.desktop SERVICE_TYPES kcmodule.desktop)
+install(TARGETS kcm_akonadicontact_actions DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/kaddressbook)
 
 target_link_libraries(kcm_akonadicontact_actions KF5::ConfigWidgets KF5::I18n KF5::Completion) 
-
-
-
-install(TARGETS kcm_akonadicontact_actions DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-########### install files ###############
-
-install(FILES akonadicontact_actions.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})

kcm/akonadicontact_actions.desktop

@@ -3,7 +3,7 @@ Icon=configure
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
-X-KDE-Library=kcm_akonadicontact_actions
+X-KDE-Library=pim/kcms/kaddressbook/kcm_akonadicontact_actions
 X-KDE-ParentApp=kaddressbook
 X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
 X-KDE-CfgDlgHierarchy=KAddressBook

kcm/kcmakonadicontactactions.cpp

@@ -18,7 +18,7 @@
 
 Q_DECLARE_METATYPE(ContactActionsSettings::EnumDialPhoneNumberAction)
 
-K_PLUGIN_FACTORY(KCMAkonadiContactActionsFactory, registerPlugin<KCMAkonadiContactActions>();)
+K_PLUGIN_CLASS_WITH_JSON(KCMAkonadiContactActions, "akonadicontact_actions.json")
 
 KCMAkonadiContactActions::KCMAkonadiContactActions(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args)