From fe00f4058f2f41b8a9de506acdf0aeed751926fa Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 11 Aug 2023 17:27:32 +0300
Subject: [PATCH] kdecore: remove TODO related to KPluginLoader

the property shall not be removed

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdecore/util/kpluginloader.cpp | 5 +++--
 kdecore/util/kpluginloader.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp
index 4285205f..11dc5c5d 100644
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
@@ -69,8 +69,9 @@ static QString findLibraryInternal(const QString &name, const KComponentData &cD
     }
 
     // If it is a absolute path just return it
-    if (!QDir::isRelativePath(libname))
+    if (!QDir::isRelativePath(libname)) {
         return libname;
+    }
 
     // Check for kde modules/plugins?
     QString libfile = cData.dirs()->findResource("module", libname);
@@ -168,8 +169,8 @@ KPluginFactory* KPluginLoader::factory()
         kDebug() << "Expected a KPluginFactory, got a" << obj->metaObject()->className();
         delete obj;
         d->errorString = i18n("The library %1 does not offer a KDE 4 compatible factory.", d->name);
+        return nullptr;
     }
-
     return factory;
 }
 
diff --git a/kdecore/util/kpluginloader.h b/kdecore/util/kpluginloader.h
index 50b1e042..9862835e 100644
--- a/kdecore/util/kpluginloader.h
+++ b/kdecore/util/kpluginloader.h
@@ -76,7 +76,7 @@ class KPluginLoaderPrivate;
 class KDECORE_EXPORT KPluginLoader : public QPluginLoader
 {
     Q_OBJECT
-    Q_PROPERTY(QString pluginName READ pluginName) // KDE5: REMOVE?
+    Q_PROPERTY(QString pluginName READ pluginName)
 public:
     /**
      * Used this constructor to load a plugin with a given library name. Plugin libraries shouldn't have a 'lib' prefix.