Commit 8c89b9f8 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use K_PLUGIN_CLASS_WITH_JSON install in pim/kcm/kaddressbook too

parent 2ad01454
Pipeline #66248 passed with stage
in 11 minutes and 17 seconds
...@@ -13,14 +13,8 @@ kconfig_add_kcfg_files(kcm_akonadicontact_actions ${Akonadi-Contact_SOURCE_DIR}/ ...@@ -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) 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})
...@@ -3,7 +3,7 @@ Icon=configure ...@@ -3,7 +3,7 @@ Icon=configure
Type=Service Type=Service
X-KDE-ServiceTypes=KCModule 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-ParentApp=kaddressbook
X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
X-KDE-CfgDlgHierarchy=KAddressBook X-KDE-CfgDlgHierarchy=KAddressBook
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Q_DECLARE_METATYPE(ContactActionsSettings::EnumDialPhoneNumberAction) 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) KCMAkonadiContactActions::KCMAkonadiContactActions(QWidget *parent, const QVariantList &args)
: KCModule(parent, args) : KCModule(parent, args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment