feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I31edd50b2301f4d9b64e1c7980c4ed371e00c2dc
This commit is contained in:
Ulf Hermann
2018-07-25 14:19:14 +02:00
parent babf038ce8 6bf5e71c43
commit 5b8989d017
7 changed files with 4697 additions and 6299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -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();