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

Debugger: make BreakpointParameters::fileName a Utils::FilePath

Browse Source 
Task-number: QTCREATORBUG-23339
Change-Id: Ifc497c14589cd6df10d8219533e100f1919213b3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2020-01-02 11:31:14 +01:00
parent 1291755288
commit a7dd0e50a2
14 changed files with 105 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,8 +625,11 @@ void QmlEngine::executeStepOver(bool)
void QmlEngine::executeRunToLine(const ContextData &data)
{
QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
showStatusMessage(tr("Run to line %1 (%2) requested...").arg(data.lineNumber).arg(data.fileName), 5000);
d->setBreakpoint(SCRIPTREGEXP, data.fileName, true, data.lineNumber);
showStatusMessage(tr("Run to line %1 (%2) requested...")
.arg(data.lineNumber)
.arg(data.fileName.toString()),
5000);
d->setBreakpoint(SCRIPTREGEXP, data.fileName.toString(), true, data.lineNumber);
clearExceptionSelection();
d->continueDebugging(Continue);
@@ -677,7 +680,7 @@ void QmlEngine::insertBreakpoint(const Breakpoint &bp)
d->setExceptionBreak(AllExceptions, requested.enabled);
} else if (requested.type == BreakpointByFileAndLine) {
d->setBreakpoint(SCRIPTREGEXP, requested.fileName,
d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toString(),
requested.enabled, requested.lineNumber, 0,
requested.condition, requested.ignoreCount);
@@ -735,7 +738,7 @@ void QmlEngine::updateBreakpoint(const Breakpoint &bp)
d->changeBreakpoint(bp, requested.enabled);
} else {
d->clearBreakpoint(bp);
d->setBreakpoint(SCRIPTREGEXP, requested.fileName,
d->setBreakpoint(SCRIPTREGEXP, requested.fileName.toString(),
requested.enabled, requested.lineNumber, 0,
requested.condition, requested.ignoreCount);
d->breakpointsSync.insert(d->sequence, bp);
@@ -1855,7 +1858,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
clearBreakpoint(bp);
setBreakpoint(SCRIPTREGEXP,
params.fileName,
params.fileName.toString(),
params.enabled,
params.lineNumber,
newColumn,