Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

src/plugins/debugger/gdb/gdbengine.cpp

@@ -644,6 +644,9 @@ void GdbEngine::handleResponse(const QByteArray &buff)
                     if (!handler->isOneShot(id))
                         handler->removeAlienBreakpoint(id);
                 }
+            } else if (asyncClass == "cmd-param-changed") {
+                // New since 2012-08-09
+                //  "{param="debug remote",value="1"}"
             } else {
                 qDebug() << "IGNORED ASYNC OUTPUT"
                     << asyncClass << result.toString();