Commit fe3d5b70 authored by David Faure's avatar David Faure
Browse files

knotes: 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 knotes plugin

Reviewers: winterz, mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28613
parent f0c751d6
......@@ -47,7 +47,7 @@ set(AKONADINOTES_LIB_VERSION "5.14.40")
set(AKONADI_VERSION "5.14.40")
set(CALENDARUTILS_LIB_VERSION "5.14.40")
set(KDEPIM_APPS_LIB_VERSION "5.14.40")
set(KONTACTINTERFACE_LIB_VERSION "5.14.41")
set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
set(LIBKDEPIM_LIB_VERSION "5.14.40")
set(KMIME_LIB_VERSION "5.14.40")
......
......@@ -31,7 +31,7 @@ target_link_libraries(kontact_knotesplugin
KF5::CalendarCore
KF5::CalendarUtils
KF5::KontactInterface
KF5::Libkdepim
KF5::Libkdepim
notesharedprivate
KF5::DNSSD
KF5::Mime
......@@ -39,9 +39,11 @@ target_link_libraries(kontact_knotesplugin
KF5::AkonadiWidgets
KF5::AkonadiNotes
KF5::ItemViews
KF5::Contacts
KF5::Contacts
)
kcoreaddons_desktop_to_json(kontact_knotesplugin knotesplugin.desktop)
########### install files ###############
set(kcm_knotessummary_PART_SRCS kcmknotessummary.cpp )
......@@ -56,7 +58,7 @@ install(TARGETS kcm_knotessummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kcmknotessummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS kontact_knotesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_knotesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES knotes_part.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/knotes)
install(FILES knotesplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
install(FILES org.kde.kontact.KNotes.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
......
......@@ -50,7 +50,7 @@ using namespace KCalendarCore;
#include <QDropEvent>
#include <QStandardPaths>
EXPORT_KONTACT_PLUGIN(KNotesPlugin, knotes)
EXPORT_KONTACT_PLUGIN_WITH_JSON(KNotesPlugin, "knotesplugin.json")
KNotesPlugin::KNotesPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "knotes")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-notes
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_knotesplugin
X-KDE-Library=kontact5/kontact_knotesplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPluginHasSummary=true
X-KDE-KontactPartExecutableName=knotes
......
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