QmlJsDebugger: Handle Breakpoint states correctly.

The QmlJsDebugger likes to remove breakpoints in the
BreakpointInsertProceeding state. The state transition from
BreakpointInsertProceeding to BreakpointRemoveRequested is now
allowed. The state of breakpoint is set to BreakpointInserted
only when the breakpoint is hit.

Change-Id: I2fdd8d916363866fd920af7488f78d92df54d93b
Reviewed-on: http://codereview.qt-project.org/5899
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 1f16f713cd..cb1df995c2 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -842,7 +842,8 @@ static bool isAllowedTransition(BreakpointState from, BreakpointState to)
     case BreakpointInsertProceeding:
         return to == BreakpointInserted
             || to == BreakpointDead
-            || to == BreakpointChangeRequested;
+            || to == BreakpointChangeRequested
+            || to == BreakpointRemoveRequested;
     case BreakpointChangeRequested:
         return to == BreakpointChangeProceeding;
     case BreakpointChangeProceeding:
@@ -1011,6 +1012,7 @@ void BreakHandler::removeBreakpoint(BreakpointModelId id)
     BREAK_ASSERT(it != m_storage.end(), return);
     switch (it->state) {
     case BreakpointInserted:
+    case BreakpointInsertProceeding:
         setState(id, BreakpointRemoveRequested);
         scheduleSynchronization();
         break;
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index c7b64cc36b..12710c44d1 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -416,6 +416,8 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
                 QString processedFilename = handler->fileName(id);
 
                 if (processedFilename == file && handler->lineNumber(id) == line) {
+                    if (handler->state(id) == BreakpointInsertProceeding)
+                        handler->notifyBreakpointInsertOk(id);
                     QTC_CHECK(handler->state(id) == BreakpointInserted);
                     BreakpointResponse br = handler->response(id);
                     br.fileName = file;