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/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -949,6 +949,11 @@ void QmlV8DebuggerClient::endSession()
    d->disconnect();
 }

+void QmlV8DebuggerClient::resetSession()
+{
+    clearExceptionSelection();
+}
+
 void QmlV8DebuggerClient::executeStep()
 {
    clearExceptionSelection();