Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-18 11:54:02 +02:00
parent 7b4895d7ec 35211c04b1
commit 5563604876
54 changed files with 8051 additions and 2843 deletions
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -656,6 +656,9 @@ void QmlEngine::shutdownInferior()

 void QmlEngine::shutdownEngine()
 {
+    if (m_adapter.activeDebuggerClient())
+        m_adapter.activeDebuggerClient()->resetSession();
+
    if (qmlConsoleManager())
        qmlConsoleManager()->setScriptEvaluator(0);
    m_noDebugOutputTimer.stop();