Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging

1 files changed, 8 insertions, 7 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index 3e0c3265f8..05f63c7ee8 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -96,7 +96,7 @@ public:
 private:
     // private slot
     void _q_deliverMessage(const QString &serviceName, const QByteArray &message);
-    static QDeclarativeDebugServerConnection *loadConnectionPlugin(const QString &pluginName);
+    static QDeclarativeDebugServerConnection *loadConnectionPlugin(QPluginLoader *loader, const QString &pluginName);
 };
 
 QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate() :
@@ -120,7 +120,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
 }
 
 QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
-    const QString &pluginName)
+        QPluginLoader *loader, const QString &pluginName)
 {
 #ifndef QT_NO_LIBRARY
     QStringList pluginCandidates;
@@ -137,17 +137,17 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
     }
 
     foreach (const QString &pluginPath, pluginCandidates) {
-        QPluginLoader loader(pluginPath);
-        if (!loader.load()) {
+        loader->setFileName(pluginPath);
+        if (!loader->load()) {
             continue;
         }
         QDeclarativeDebugServerConnection *connection = 0;
-        if (QObject *instance = loader.instance())
+        if (QObject *instance = loader->instance())
             connection = qobject_cast<QDeclarativeDebugServerConnection*>(instance);
 
         if (connection)
             return connection;
-        loader.unload();
+        loader->unload();
     }
 #endif
     return 0;
@@ -202,8 +202,9 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
             if (ok) {
                 server = new QDeclarativeDebugServer();
 
+                QPluginLoader *loader = new QPluginLoader(server);
                 QDeclarativeDebugServerConnection *connection
-                        = QDeclarativeDebugServerPrivate::loadConnectionPlugin(pluginName);
+                        = QDeclarativeDebugServerPrivate::loadConnectionPlugin(loader, pluginName);
                 if (connection) {
                     server->d_func()->connection = connection;