Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/qml/debugger/qqmldebug.cpp

Change-Id: I93de5a81b18cdece475870cf7cfba1b9baef2304

1 files changed, 9 insertions, 15 deletions

diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 6af43b1823..d3a8d1f0d1 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -223,27 +223,21 @@ void QQmlDebugServerThread::run()
     Q_ASSERT_X(m_server != 0, Q_FUNC_INFO, "There should always be a debug server available here.");
     QQmlDebugServerConnection *connection = loadQQmlDebugServerConnection(m_pluginName);
     if (connection) {
-        connection->setServer(m_server);
-
-        if (m_fileName.isEmpty()) {
-            if (!connection->setPortRange(m_portFrom, m_portTo, m_server->blockingMode(),
-                                          m_hostAddress)) {
-                delete connection;
-                return;
-            }
-        } else {
-            if (!connection->setFileName(m_fileName, m_server->blockingMode())) {
-                delete connection;
-                return;
-            }
-        }
-
         {
             QMutexLocker connectionLocker(&m_server->m_helloMutex);
             m_server->m_connection = connection;
+            connection->setServer(m_server);
             m_server->m_helloCondition.wakeAll();
         }
 
+        if (m_fileName.isEmpty()) {
+            if (!connection->setPortRange(m_portFrom, m_portTo, m_server->blockingMode(),
+                                          m_hostAddress))
+                return;
+        } else if (!connection->setFileName(m_fileName, m_server->blockingMode())) {
+            return;
+        }
+
         if (m_server->blockingMode())
             connection->waitForConnection();
     } else {