Commit ae4b2ce1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix plugin api

parent d2533087
Pipeline #188063 passed with stage
in 5 minutes and 21 seconds
......@@ -52,7 +52,7 @@ set(CALENDARUTILS_LIB_VERSION "5.20.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.20.40")
set(KLDAP_LIB_VERSION "5.20.40")
set(KMAILTRANSPORT_LIB_VERSION "5.20.40")
set(KONTACTINTERFACE_LIB_VERSION "5.20.40")
set(KONTACTINTERFACE_LIB_VERSION "5.20.41")
set(KMIME_LIB_VERSION "5.20.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.20.40")
set(AKONADI_VERSION "5.20.42")
......@@ -157,8 +157,8 @@ if(BUILD_TESTING)
endif()
ecm_set_disabled_deprecation_versions(QT 5.15.2
KF 5.95.0
KCOREADDONS 5.88.0 #KPluginFactory::registerPlugin
)
KCOREADDONS 5.88.0 #KPluginFactory::registerPlugin (remove it when we will depend against kf5.95)
)
find_package(KUserFeedback 1.2.0 CONFIG)
set_package_properties(KUserFeedback PROPERTIES DESCRIPTION "User Feedback lib" TYPE OPTIONAL PURPOSE "Allow to send Telemetry Information (optional).")
......
......@@ -33,8 +33,8 @@ using namespace KCalendarCore;
EXPORT_KONTACT_PLUGIN_WITH_JSON(KMailPlugin, "kmailplugin.json")
KMailPlugin::KMailPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "kmail2")
KMailPlugin::KMailPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, "kmail2")
{
setComponentName(QStringLiteral("kmail2"), i18n("KMail2"));
......
......@@ -37,7 +37,7 @@ class KMailPlugin : public KontactInterface::Plugin
Q_OBJECT
public:
KMailPlugin(KontactInterface::Core *core, const QVariantList &);
KMailPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~KMailPlugin() override;
Q_REQUIRED_RESULT bool isRunningStandalone() const override;
......
......@@ -23,8 +23,8 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(SummaryView, "summaryplugin.json")
SummaryView::SummaryView(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, nullptr)
SummaryView::SummaryView(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, nullptr)
{
mSyncAction = new KSelectAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Sync All"), this);
actionCollection()->addAction(QStringLiteral("kontact_summary_sync"), mSyncAction);
......
......@@ -18,7 +18,7 @@ class SummaryView : public KontactInterface::Plugin
Q_OBJECT
public:
SummaryView(KontactInterface::Core *core, const QVariantList &);
SummaryView(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~SummaryView() override;
int weight() const override
......
Supports Markdown
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