Merge remote-tracking branch 'origin/3.6'

Change-Id: Ic7cba72e7bec10e4fc0099b97e3317e391a6aa5d

1 files changed, 14 insertions, 0 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 2b09d4e289c..71d1d2f0175 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -105,6 +105,7 @@ void QmlProfilerClientManager::setTcpConnection(QString host, quint64 port)
 {
     d->tcpHost = host;
     d->tcpPort = port;
+    disconnectClient();
 }
 
 void QmlProfilerClientManager::clearBufferedData()
@@ -139,6 +140,8 @@ void QmlProfilerClientManager::connectClient(quint16 port)
             this, &QmlProfilerClientManager::qmlDebugConnectionOpened);
     connect(d->connection, &QmlDebugConnection::closed,
             this, &QmlProfilerClientManager::qmlDebugConnectionClosed);
+    connect(d->connection, &QmlDebugConnection::error,
+            this, &QmlProfilerClientManager::qmlDebugConnectionError);
     d->connectionTimer.start();
     d->tcpPort = port;
 }
@@ -270,6 +273,17 @@ void QmlProfilerClientManager::qmlDebugConnectionClosed()
     emit connectionClosed();
 }
 
+void QmlProfilerClientManager::qmlDebugConnectionError(QDebugSupport::Error error)
+{
+    logState(tr("Debug connection error %1").arg(error));
+    if (d->connection->isOpen()) {
+        disconnectClient();
+        emit connectionClosed();
+    } else {
+        disconnectClient();
+    }
+}
+
 void QmlProfilerClientManager::logState(const QString &msg)
 {
     QString state = QLatin1String("QML Profiler: ") + msg;