Merge remote branch 'origin/2.1'

Conflicts: doc/qtcreator.qdoc share/qtcreator/templates/mobileapp/app.pro
2010-10-25 11:27:30 +02:00
parent 3b2614c697 49bb852292
commit 35bb61590d
83 changed files with 83178 additions and 77579 deletions
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -226,6 +226,7 @@ public:
        m_startParameters(sp),
        m_state(DebuggerNotReady),
        m_lastGoodState(DebuggerNotReady),
+        m_targetState(DebuggerNotReady),
        m_breakHandler(engine),
        m_commandHandler(engine),
        m_modulesHandler(engine),