From 36e93e9c5a44651302090c87c46573cf8ee528c4 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 28 Apr 2014 15:36:44 +0200 Subject: [PATCH] Adapt to changes in KDEInstallDirs Plugins of non kf5 frameworks are not in a kf5/ subdir anymore REVIEW: 117838 --- kcmkwin/kwindecoration/configdialog.cpp | 2 +- kcmkwin/kwindecoration/decorationmodel.cpp | 2 +- libkdecorations/kdecoration_plugins_p.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwindecoration/configdialog.cpp b/kcmkwin/kwindecoration/configdialog.cpp index a58806e991..1b022b2fcb 100644 --- a/kcmkwin/kwindecoration/configdialog.cpp +++ b/kcmkwin/kwindecoration/configdialog.cpp @@ -90,7 +90,7 @@ KWinDecorationConfigDialog::KWinDecorationConfigDialog(QString deco, const QList m_pluginConfigWidget = new QWidget(this); m_pluginConfigWidget->setLayout(new QVBoxLayout); - m_pluginObject = KPluginTrader::self()->createInstanceFromQuery(QStringLiteral("kf5/kwin/kdecorations/config"), + m_pluginObject = KPluginTrader::self()->createInstanceFromQuery(QStringLiteral("kwin/kdecorations/config"), QString(), QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(deco), m_pluginConfigWidget, diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp index bb64b46a6b..96a2f10677 100644 --- a/kcmkwin/kwindecoration/decorationmodel.cpp +++ b/kcmkwin/kwindecoration/decorationmodel.cpp @@ -89,7 +89,7 @@ void DecorationModel::reload() void DecorationModel::findDecorations() { beginResetModel(); - const auto decorations = KPluginTrader::self()->query(QStringLiteral("kf5/kwin/kdecorations")); + const auto decorations = KPluginTrader::self()->query(QStringLiteral("kwin/kdecorations")); for (const KPluginInfo &plugin : decorations) { if (plugin.pluginName() == s_auroraePluginName) { // read the Aurorae themes diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp index 8570b6a3ef..a7f804d495 100644 --- a/libkdecorations/kdecoration_plugins_p.cpp +++ b/libkdecorations/kdecoration_plugins_p.cpp @@ -105,7 +105,7 @@ bool KDecorationPlugins::loadPlugin(QString nameStr) auto createFactory = [](const QString &pluginName) -> KDecorationFactory* { qDebug() << "Trying to load decoration plugin" << pluginName; const QString query = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(pluginName); - const auto offers = KPluginTrader::self()->query(QStringLiteral("kf5/kwin/kdecorations"), QString(), query); + const auto offers = KPluginTrader::self()->query(QStringLiteral("kwin/kdecorations"), QString(), query); if (offers.isEmpty()) { qDebug() << "Decoration plugin not found"; return nullptr;