Merge commit 'origin/1.3'

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Needed changes:
        src/plugins/qt4projectmanager/qtversionmanager.cpp

src/plugins/debugger/debuggermanager.h

@@ -244,6 +244,8 @@ public slots:
     void showStatusMessage(const QString &msg, int timeout = -1); // -1 forever
     void clearCppCodeModelSnapshot();
 
+    static const char *stateName(int s);
+
 public slots: // FIXME
     void showDebuggerOutput(const QString &msg)
         { showDebuggerOutput(LogDebug, msg); }