Merge remote-tracking branch 'origin/4.8'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I87f47cecbb924064296a002fd9446a0627acad8e

src/plugins/debugger/debuggerengine.cpp

@@ -418,6 +418,8 @@ public:
         m_watchHandler.cleanup();
         m_engine->showMessage(tr("Debugger finished."), StatusBar);
         m_engine->setState(DebuggerFinished); // Also destroys views.
+        if (boolSetting(SwitchModeOnExit))
+            EngineManager::deactivateDebugMode();
     }
 
     void scheduleResetLocation()
@@ -2619,7 +2621,10 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
                         "experience for this binary format.").arg(preferredDebugger);
             break;
         }
-        if (warnOnRelease && rp.cppEngineType == CdbEngineType) {
+        if (warnOnRelease
+                && rp.cppEngineType == CdbEngineType
+                && rp.startMode != AttachToRemoteServer) {
+            QTC_ASSERT(!rp.symbolFile.isEmpty(), return);
             if (!rp.symbolFile.endsWith(".exe", Qt::CaseInsensitive))
                 rp.symbolFile.append(".exe");
             QString errorMessage;