From kde-commits  Mon Jan 04 15:30:25 2016
From: Johannes Obermayr <johannesobermayr () gmx ! de>
Date: Mon, 04 Jan 2016 15:30:25 +0000
To: kde-commits
Subject: [k3b/kf5] libk3b/plugin: libk3b: Tell error if loading plugin failed.
Message-Id: <E1aG75V-0005JW-Ti () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145192143817154

Git commit 2a186a4210bafbd4b739bdb0caf769c015a6f5b8 by Johannes Obermayr.
Committed on 04/01/2016 at 15:22.
Pushed by jobermayr into branch 'kf5'.

libk3b: Tell error if loading plugin failed.

M  +6    -3    libk3b/plugin/k3bpluginmanager.cpp

http://commits.kde.org/k3b/2a186a4210bafbd4b739bdb0caf769c015a6f5b8

diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginma=
nager.cpp
index d197bca..a9ffcdc 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -99,7 +99,8 @@ QList<K3b::Plugin*> K3b::PluginManager::plugins( const QS=
tring& group ) const
 void K3b::PluginManager::Private::loadPlugin( const KService::Ptr &service=
 )
 {
     qDebug() << service->name() << service->library();
-    K3b::Plugin* plugin =3D service->createInstance<K3b::Plugin>( m_parent=
 );
+    QString err;
+    K3b::Plugin* plugin =3D service->createInstance<K3b::Plugin>( 0, m_par=
ent, QVariantList(), &err );
     if ( plugin ) {
         qDebug() << "Loaded plugin" << service->name();
         // FIXME: improve this versioning stuff
@@ -108,11 +109,13 @@ void K3b::PluginManager::Private::loadPlugin( const K=
Service::Ptr &service )
             qDebug() << "plugin system does not fit";
         }
         else {
-            KPluginInfo pluginInfo( service );
-            plugin->m_pluginInfo =3D pluginInfo;
+            plugin->m_pluginInfo =3D KPluginInfo( service->entryPath() );
             plugins.append( plugin );
         }
     }
+    else {
+        qDebug() << "Loading plugin" << service->name() << "failed. Error:=
" << err;
+    }
 =

 =

 // 	// make sure to only use the latest version of one plugin