Merge remote-tracking branch 'origin/3.6'

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

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304

src/plugins/debugger/qml/qmlengine.cpp

@@ -354,10 +354,8 @@ void QmlEngine::tryToConnect(quint16 port)
     if (state() == EngineRunRequested) {
         if (isSlaveEngine()) {
             // Probably cpp is being debugged and hence we did not get the output yet.
-            if (!masterEngine()->isDying()) {
-                d->noDebugOutputTimer.setInterval(4000);
-                d->noDebugOutputTimer.start();
-            }
+            if (!masterEngine()->isDying())
+                beginConnection(port);
             else
                 appStartupFailed(tr("No application output received in time"));
         } else {