From df5beb8ecf86d9a3c1d9d2178fd1a873ce26dcd3 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Mon, 10 Mar 2014 19:29:06 +0100
Subject: qmldebugger: avoid loading tcp module in inspector

loading the module twice starts two threads, and creates issues
when unloading.

Change-Id: I861df6a6b6a8942557d31d455b35e7987478a527
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
---
 src/qml/debugger/qqmlinspectorservice.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/qml')

diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp
index b48af34d57..5486258ae4 100644
--- a/src/qml/debugger/qqmlinspectorservice.cpp
+++ b/src/qml/debugger/qqmlinspectorservice.cpp
@@ -157,6 +157,8 @@ void QQmlInspectorService::loadInspectorPlugins()
     }
 
     foreach (const QString &pluginPath, pluginCandidates) {
+        if (pluginPath.contains(QLatin1String("qmldbg_tcp")))
+            continue;
         if (qmlDebugVerbose())
             qDebug() << "QQmlInspector: Trying to load plugin " << pluginPath << "...";
 
-- 
cgit v1.2.3