Commit 14abfb64 authored by David Faure's avatar David Faure
Browse files

korganizer: install kontactplugins 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 all
3 plugins

Reviewers: winterz, mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28612
parent 03e273ad
......@@ -48,7 +48,7 @@ set(KLDAP_LIB_VERSION "5.14.40")
set(KMAILTRANSPORT_LIB_VERSION "5.14.40")
set(CALENDARUTILS_LIB_VERSION "5.14.40")
set(AKONADICALENDAR_LIB_VERSION "5.14.41")
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")
......
......@@ -15,6 +15,8 @@ add_library(kontact_korganizerplugin MODULE ${kontact_korganizerplugin_PART_SRCS
target_link_libraries(kontact_korganizerplugin KF5::AkonadiCalendar KF5::CalendarUtils KF5::Contacts KF5::CalendarCore KF5::Libkdepim KF5::KontactInterface korganizerprivate KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem KF5::I18n)
kcoreaddons_desktop_to_json(kontact_korganizerplugin korganizerplugin.desktop)
########### next target ###############
set(kontact_todoplugin_PART_SRCS todoplugin.cpp todosummarywidget.cpp ${libcommon_SRCS})
......@@ -25,6 +27,8 @@ add_library(kontact_todoplugin MODULE ${kontact_todoplugin_PART_SRCS})
target_link_libraries(kontact_todoplugin KF5::AkonadiCalendar KF5::Contacts KF5::Libkdepim KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::CalendarSupport KF5::AkonadiCalendar KF5::WindowSystem)
kcoreaddons_desktop_to_json(kontact_todoplugin todoplugin.desktop)
########### next target ###############
set(kontact_journalplugin_PART_SRCS journalplugin.cpp ${libcommon_SRCS})
......@@ -35,6 +39,8 @@ add_library(kontact_journalplugin MODULE ${kontact_journalplugin_PART_SRCS})
target_link_libraries(kontact_journalplugin KF5::KontactInterface KF5::WindowSystem)
kcoreaddons_desktop_to_json(kontact_journalplugin journalplugin.desktop)
########### next target ###############
set(kcm_apptsummary_PART_SRCS kcmapptsummary.cpp)
......@@ -63,9 +69,9 @@ endif()
install(TARGETS kcm_apptsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kcm_todosummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_korganizerplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_todoplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_journalplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_korganizerplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(TARGETS kontact_todoplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(TARGETS kontact_journalplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES korganizerplugin.desktop todoplugin.desktop journalplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
install(FILES kcmapptsummary.desktop kcmtodosummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......
......@@ -34,7 +34,7 @@
#include <QAction>
#include <QIcon>
EXPORT_KONTACT_PLUGIN(JournalPlugin, journal)
EXPORT_KONTACT_PLUGIN_WITH_JSON(JournalPlugin, "journalplugin.json")
JournalPlugin::JournalPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "journal")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-journal
X-KDE-ServiceTypes=Kontact/Plugin
X-KDE-Library=kontact_journalplugin
X-KDE-Library=kontact5/kontact_journalplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=korganizerpart
X-KDE-KontactPartExecutableName=korganizer
......
......@@ -49,7 +49,7 @@
#include <QDropEvent>
#include <QStandardPaths>
EXPORT_KONTACT_PLUGIN(KOrganizerPlugin, korganizer)
EXPORT_KONTACT_PLUGIN_WITH_JSON(KOrganizerPlugin, "korganizerplugin.json")
KOrganizerPlugin::KOrganizerPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "calendar")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-calendar
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_korganizerplugin
X-KDE-Library=kontact5/kontact_korganizerplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=korganizerpart
X-KDE-KontactPartExecutableName=korganizer
......
......@@ -47,7 +47,7 @@
#include <QDropEvent>
EXPORT_KONTACT_PLUGIN(TodoPlugin, todo)
EXPORT_KONTACT_PLUGIN_WITH_JSON(TodoPlugin, "todoplugin.json")
TodoPlugin::TodoPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "todo")
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-pim-tasks
X-KDE-ServiceTypes=Kontact/Plugin
X-KDE-Library=kontact_todoplugin
X-KDE-Library=kontact5/kontact_todoplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPartLibraryName=korganizerpart
X-KDE-KontactPartExecutableName=korganizer
......
......@@ -24,6 +24,8 @@ target_link_libraries(kontact_specialdatesplugin
KF5::CalendarSupport
)
kcoreaddons_desktop_to_json(kontact_specialdatesplugin specialdatesplugin.desktop)
########### next target ###############
set(kcm_sdsummary_PART_SRCS kcmsdsummary.cpp)
......@@ -36,7 +38,7 @@ target_link_libraries(kcm_sdsummary Qt5::Widgets KF5::KCMUtils KF5::I18n)
########### install files ###############
install(TARGETS kontact_specialdatesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS kontact_specialdatesplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
install(TARGETS kcm_sdsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES specialdatesplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
......
......@@ -31,7 +31,7 @@
#include <KAboutData>
#include <KLocalizedString>
EXPORT_KONTACT_PLUGIN(SpecialdatesPlugin, specialdates)
EXPORT_KONTACT_PLUGIN_WITH_JSON(SpecialdatesPlugin, "specialdatesplugin.json")
SpecialdatesPlugin::SpecialdatesPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, nullptr)
......
......@@ -3,7 +3,7 @@ Type=Service
Icon=view-calendar-special-occasion
X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
X-KDE-Library=kontact_specialdatesplugin
X-KDE-Library=kontact5/kontact_specialdatesplugin
X-KDE-KontactPluginVersion=10
X-KDE-KontactPluginHasPart=false
X-KDE-KontactPluginHasSummary=true
......
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