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

Install kontact's kmailplugin and summaryplugin into kontact5, with JSON metadata.

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

Test Plan:
rm $prefix/lib64/plugins/kontact_kmailplugin.so ; make install
kontact still finds the kmail plugin

Reviewers: mlaurent, winterz

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28608
parent 0b186105
......@@ -49,7 +49,7 @@ set(CALENDARUTILS_LIB_VERSION "5.14.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.40")
set(KLDAP_LIB_VERSION "5.14.40")
set(KMAILTRANSPORT_LIB_VERSION "5.14.40")
set(KONTACTINTERFACE_LIB_VERSION "5.14.41")
set(KONTACTINTERFACE_LIB_VERSION "5.14.42")
set(KMIME_LIB_VERSION "5.14.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.14.40")
set(AKONADI_VERSION "5.14.40")
......
......@@ -30,11 +30,12 @@ target_link_libraries(kcm_kmailsummary KF5::Mime KF5::PimCommonAkonadi Qt5::DBu
########### install files ###############
install(TARGETS kontact_kmailplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_kmailplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(TARGETS kcm_kmailsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kmailplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
kcoreaddons_desktop_to_json(kontact_kmailplugin kmailplugin.desktop)
install(FILES kcmkmailsummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......
......@@ -47,7 +47,7 @@
using namespace KCalUtils;
using namespace KCalendarCore;
EXPORT_KONTACT_PLUGIN(KMailPlugin, kmail)
EXPORT_KONTACT_PLUGIN_WITH_JSON(KMailPlugin, "kmailplugin.json")
KMailPlugin::KMailPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "kmail2")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-mail
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_kmailplugin
X-KDE-Library=kontact5/kontact_kmailplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=kmailpart
X-KDE-KontactPartExecutableName=kmail
......
......@@ -11,6 +11,8 @@ add_dependencies(kontact_summaryplugin kmail_xml)
target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::IdentityManagement KF5::KontactInterface KF5::Libkdepim KF5::ConfigCore)
kcoreaddons_desktop_to_json(kontact_summaryplugin summaryplugin.desktop)
########### next target ###############
set(kcm_kontactsummary_PART_SRCS kcmkontactsummary.cpp)
......@@ -21,7 +23,7 @@ target_link_libraries(kcm_kontactsummary KF5::KCMUtils Qt5::Widgets KF5::KCMUtil
########### install files ###############
install(TARGETS kontact_summaryplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_summaryplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(TARGETS kcm_kontactsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES summaryplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-calendar-agenda
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_summaryplugin
X-KDE-Library=kontact5/kontact_summaryplugin
X-KDE-KontactPluginVersion=10
X-KDE-PluginInfo-Name=kontact_summaryplugin
......
......@@ -34,7 +34,7 @@
#include <QMenu>
EXPORT_KONTACT_PLUGIN(SummaryView, summary)
EXPORT_KONTACT_PLUGIN_WITH_JSON(SummaryView, "summaryplugin.json")
SummaryView::SummaryView(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, nullptr)
......
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