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

Install plugins in pim<version>

parent 0146cb76
Pipeline #187713 passed with stage
in 3 minutes and 21 seconds
......@@ -62,7 +62,7 @@ void KcmKontact::load()
{
const KConfigGroup grp(Prefs::self()->config(), "Plugins");
const QVector<KPluginMetaData> pluginMetaDatas =
KPluginMetaData::findPlugins(QStringLiteral("kontact" QT_STRINGIFY(QT_VERSION_MAJOR)), [](const KPluginMetaData &data) {
KPluginMetaData::findPlugins(QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kontact"), [](const KPluginMetaData &data) {
return data.rawData().value(QStringLiteral("X-KDE-KontactPluginVersion")).toInt() == KONTACT_PLUGIN_VERSION;
});
......
......@@ -71,7 +71,7 @@ private:
static void listPlugins()
{
const QVector<KPluginMetaData> pluginMetaDatas =
KPluginMetaData::findPlugins(QStringLiteral("kontact" QT_STRINGIFY(QT_VERSION_MAJOR)), [](const KPluginMetaData &data) {
KPluginMetaData::findPlugins(QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kontact"), [](const KPluginMetaData &data) {
return data.rawData().value(QStringLiteral("X-KDE-KontactPluginVersion")).toInt() == KONTACT_PLUGIN_VERSION;
});
......
......@@ -133,9 +133,10 @@ void MainWindow::initObject()
qFatal("KSycoca unavailable. Kontact will be unable to find plugins.");
}
}
mPluginMetaData = KPluginMetaData::findPlugins(QStringLiteral("kontact" QT_STRINGIFY(QT_VERSION_MAJOR)), [](const KPluginMetaData &data) {
return data.rawData().value(QStringLiteral("X-KDE-KontactPluginVersion")).toInt() == KONTACT_PLUGIN_VERSION;
});
mPluginMetaData =
KPluginMetaData::findPlugins(QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kontact"), [](const KPluginMetaData &data) {
return data.rawData().value(QStringLiteral("X-KDE-KontactPluginVersion")).toInt() == KONTACT_PLUGIN_VERSION;
});
// prepare the part manager
mPartManager = new KParts::PartManager(this);
......
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