yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt to changes in KDEInstallDirs

Browse source 
Plugins of non kf5 frameworks are not in a kf5/ subdir anymore

REVIEW: 117838
This commit is contained in:
Aleix Pol 2014-04-28 15:36:44 +02:00
parent 21a0cda055
commit 36e93e9c5a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/configdialog.cpp
View file

@ -90,7 +90,7 @@ KWinDecorationConfigDialog::KWinDecorationConfigDialog(QString deco, const QList
m_pluginConfigWidget = new QWidget(this); m_pluginConfigWidget = new QWidget(this);
m_pluginConfigWidget->setLayout(new QVBoxLayout); m_pluginConfigWidget->setLayout(new QVBoxLayout);
m_pluginObject = KPluginTrader::self()->createInstanceFromQuery<QObject>(QStringLiteral("kf5/kwin/kdecorations/config"), m_pluginObject = KPluginTrader::self()->createInstanceFromQuery<QObject>(QStringLiteral("kwin/kdecorations/config"),
QString(), QString(),
QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(deco), QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(deco),
m_pluginConfigWidget, m_pluginConfigWidget,

2
kcmkwin/kwindecoration/decorationmodel.cpp
View file

@ -89,7 +89,7 @@ void DecorationModel::reload()
void DecorationModel::findDecorations() void DecorationModel::findDecorations()
{ {
beginResetModel(); 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) { for (const KPluginInfo &plugin : decorations) {
if (plugin.pluginName() == s_auroraePluginName) { if (plugin.pluginName() == s_auroraePluginName) {
// read the Aurorae themes // read the Aurorae themes

2
libkdecorations/kdecoration_plugins_p.cpp
View file

@ -105,7 +105,7 @@ bool KDecorationPlugins::loadPlugin(QString nameStr)
auto createFactory = [](const QString &pluginName) -> KDecorationFactory* { auto createFactory = [](const QString &pluginName) -> KDecorationFactory* {
qDebug() << "Trying to load decoration plugin" << pluginName; qDebug() << "Trying to load decoration plugin" << pluginName;
const QString query = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(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()) { if (offers.isEmpty()) {
qDebug() << "Decoration plugin not found"; qDebug() << "Decoration plugin not found";
return nullptr; return nullptr;