Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index cae8ea487e..fc04703726 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -112,13 +112,18 @@ void QmlProfilerClientManager::setTcpConnection(QString host, Utils::Port port)
 {
     d->tcpHost = host;
     d->tcpPort = port;
+    d->localSocket.clear();
     disconnectClient();
+    // Wait for the application to announce the port before connecting.
 }
 
 void QmlProfilerClientManager::setLocalSocket(QString file)
 {
     d->localSocket = file;
+    d->tcpHost.clear();
     d->tcpPort = Utils::Port();
+    disconnectClient();
+    // We open the server and the application connects to it, so let's do that right away.
     connectLocalClient(file);
 }