Debugger: Mark pending C++ breakpoints with hour glass icon

Change-Id: If012953f8fb1e2705244ffe9f02c6bbbbc9d93c1
Reviewed-by: Christian Stenger <[email protected]>

2 files changed, 9 insertions, 1 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 5629c9bee82..23cd6bfc634 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1441,7 +1441,7 @@ QIcon BreakpointItem::icon() const
         return BreakHandler::watchpointIcon();
     if (!m_params.enabled)
         return BreakHandler::disabledBreakpointIcon();
-    if (m_state == BreakpointInserted)
+    if (m_state == BreakpointInserted && !m_response.pending)
         return BreakHandler::breakpointIcon();
     return BreakHandler::pendingBreakpointIcon();
 }
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index e7250b536a1..d642c49c396 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -753,6 +753,9 @@ void QmlEngine::insertBreakpoint(Breakpoint bp)
 
     const BreakpointParameters &params = bp.parameters();
     if (params.type == BreakpointAtJavaScriptThrow) {
+        BreakpointResponse br = bp.response();
+        br.pending = false;
+        bp.setResponse(br);
         bp.notifyBreakpointInsertOk();
         d->setExceptionBreak(AllExceptions, params.enabled);
 
@@ -763,6 +766,9 @@ void QmlEngine::insertBreakpoint(Breakpoint bp)
 
     } else if (params.type == BreakpointOnQmlSignalEmit) {
         d->setBreakpoint(QString(_(EVENT)), params.functionName, params.enabled);
+        BreakpointResponse br = bp.response();
+        br.pending = false;
+        bp.setResponse(br);
         bp.notifyBreakpointInsertOk();
     }
 
@@ -1798,6 +1804,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
                             if (bp.state() != BreakpointInserted) {
                                 BreakpointResponse br = bp.response();
                                 br.lineNumber = breakpointData.value(_("line")).toInt() + 1;
+                                br.pending = false;
                                 bp.setResponse(br);
                                 bp.notifyBreakpointInsertOk();
                             }
@@ -1958,6 +1965,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
                                 if (bp.state() != BreakpointInserted) {
                                     br.lineNumber = breakData.value(
                                                 _("sourceLine")).toInt() + 1;
+                                    br.pending = false;
                                     bp.setResponse(br);
                                     bp.notifyBreakpointInsertOk();
                                 }