From 92667f36c84b8d62f00b918057845dc51f829ec3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 2 Apr 2022 15:53:45 +0300 Subject: [PATCH] kgreeter: add plugin paths to application library paths Signed-off-by: Ivailo Monev --- kgreeter/kcm/kgreeterconfig.cpp | 15 +++++++-------- kgreeter/kgreeter.cpp | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kgreeter/kcm/kgreeterconfig.cpp b/kgreeter/kcm/kgreeterconfig.cpp index 7119a582..ab33e576 100644 --- a/kgreeter/kcm/kgreeterconfig.cpp +++ b/kgreeter/kcm/kgreeterconfig.cpp @@ -46,13 +46,12 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args) setupUi(this); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkgreeter"), 0, - ki18n("KDE Greeter Module"), - 0, KLocalizedString(), KAboutData::License_GPL, - ki18n("Copyright 2022, Ivailo Monev xakepa10@gmail.com" - )); - + KAboutData *about = new KAboutData( + I18N_NOOP("kcmkgreeter"), 0, + ki18n("KDE Greeter Module"), + 0, KLocalizedString(), KAboutData::License_GPL, + ki18n("Copyright 2022, Ivailo Monev xakepa10@gmail.com") + ); about->addAuthor(ki18n("Ivailo Monev"), KLocalizedString(), "xakepa10@gmail.com"); setAboutData(about); @@ -64,7 +63,7 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args) connect(stylesbox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotStyleChanged(QString))); colorsbox->addItem(i18n("Default"), QVariant(QString::fromLatin1("default"))); - const QStringList kcolorschemes = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates); + const QStringList kcolorschemes = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors"); foreach (const QString &kcolorscheme, kcolorschemes) { const QString kcolorschemename = QSettings(kcolorscheme, QSettings::IniFormat).value("General/Name").toString(); const QString kcolorschemebasename = QFileInfo(kcolorscheme).baseName(); diff --git a/kgreeter/kgreeter.cpp b/kgreeter/kgreeter.cpp index 8915de9a..28a346fc 100644 --- a/kgreeter/kgreeter.cpp +++ b/kgreeter/kgreeter.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -449,6 +450,12 @@ int main(int argc, char**argv) { QApplication app(argc, argv); + // for the style + const QStringList pluginpaths = KGlobal::dirs()->resourceDirs("qtplugins"); + Q_FOREACH (const QString &path, pluginpaths) { + app.addLibraryPath(path); + } + const QString kgreeterstyle = kgreetersettings.value("greeter/style").toString(); if (!kgreeterstyle.isEmpty()) { app.setStyle(kgreeterstyle);