Commit 56f0f4a0 authored by David Faure's avatar David Faure
Browse files

kaddressbook: install kontactplugin into kontact5, with JSON metadata.

Summary: This will allow kontact to use KPluginLoader one day.

Test Plan: make uninstall, apply patch, make install, kontact loads kaddressbook plugin

Reviewers: winterz, mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28611
parent 212297ce
......@@ -39,7 +39,7 @@ set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSI
set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
set(AKONADI_VERSION "5.14.40")
set(KONTACTINTERFACE_LIB_VERSION "5.14.41")
set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "5")
......
......@@ -16,7 +16,8 @@ add_library(kontact_kaddressbookplugin MODULE ${kontact_kaddressbookplugin_PART_
target_link_libraries(kontact_kaddressbookplugin
KF5::KontactInterface
)
kcoreaddons_desktop_to_json(kontact_kaddressbookplugin kaddressbookplugin.desktop)
install(TARGETS kontact_kaddressbookplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_kaddressbookplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES kaddressbookplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
install(FILES kaddressbook.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
......@@ -35,7 +35,7 @@
#include <QDBusReply>
#include <QStandardPaths>
EXPORT_KONTACT_PLUGIN(KAddressBookPlugin, kaddressbook)
EXPORT_KONTACT_PLUGIN_WITH_JSON(KAddressBookPlugin, "kaddressbookplugin.json")
KAddressBookPlugin::KAddressBookPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "kaddressbook")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-contacts
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_kaddressbookplugin
X-KDE-Library=kontact5/kontact_kaddressbookplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=kaddressbookpart
X-KDE-KontactPartExecutableName=kaddressbook
......
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