Merge remote-tracking branch 'origin/3.6'

Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
2015-10-30 16:07:56 +01:00
parent e60f62c131 9fc4396e11
commit 310ae09996
95 changed files with 1696 additions and 860 deletions
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -120,8 +120,15 @@ void QmlProfilerClientManager::discardPendingData()

 void QmlProfilerClientManager::connectClient(quint16 port)
 {
-    if (d->connection)
-        delete d->connection;
+    if (d->connection) {
+        if (port == d->tcpPort) {
+            tryToConnect();
+            return;
+        } else {
+            delete d->connection;
+        }
+    }
+
    d->connection = new QmlDebugConnection;
    enableServices();
    connect(d->connection, SIGNAL(stateMessage(QString)), this, SLOT(logState(QString)));