diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-25 14:19:14 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-25 14:19:14 +0200 |
commit | 5b8989d01772099815d1b1acfd44bfe708c5bfff (patch) | |
tree | e007ab0093ab5f2ff92d1a71780fcd68ff3ccf1f /src/plugins/debugger/qml/qmlengine.cpp | |
parent | babf038ce8f9174578545df843ff183a1583fd08 (diff) | |
parent | 6bf5e71c4384aab46e8e40766156907bb940edd9 (diff) |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/qml/qmlengine.cpp
Change-Id: I31edd50b2301f4d9b64e1c7980c4ed371e00c2dc
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 21cdbdd141..908e9140a5 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -758,22 +758,19 @@ void QmlEngine::changeBreakpoint(Breakpoint bp) BreakpointResponse br = bp.response(); if (params.type == BreakpointAtJavaScriptThrow) { d->setExceptionBreak(AllExceptions, params.enabled); - br.enabled = params.enabled; - bp.setResponse(br); } else if (params.type == BreakpointOnQmlSignalEmit) { d->setBreakpoint(EVENT, params.functionName, params.enabled); - br.enabled = params.enabled; - bp.setResponse(br); } else if (d->canChangeBreakpoint()) { d->changeBreakpoint(d->breakpoints.value(bp.id()), params.enabled); } else { - //V8 supports only minimalistic changes in breakpoint - //Remove the breakpoint and add again - bp.notifyBreakpointChangeOk(); - bp.removeBreakpoint(); - BreakHandler *handler = d->engine->breakHandler(); - handler->appendBreakpoint(params); + d->clearBreakpoint(d->breakpoints.take(bp.id())); + d->setBreakpoint(SCRIPTREGEXP, params.fileName, + params.enabled, params.lineNumber, 0, + params.condition, params.ignoreCount); + d->breakpointsSync.insert(d->sequence, bp.id()); } + br.enabled = params.enabled; + bp.setResponse(br); if (bp.state() == BreakpointChangeProceeding) bp.notifyBreakpointChangeOk(); |