diff options
| author | David Schulz <david.schulz@qt.io> | 2020-01-02 11:31:14 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2020-01-06 13:29:44 +0000 |
| commit | a7dd0e50a28595eb976d77b1b23b8120b0a9395a (patch) | |
| tree | c40150044b4b57f7e1feae0502fcd73b8e2ffacb /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 1291755288ca11ba548cd3467dbe5b81496c541d (diff) | |
Debugger: make BreakpointParameters::fileName a Utils::FilePath
Task-number: QTCREATORBUG-23339
Change-Id: Ifc497c14589cd6df10d8219533e100f1919213b3
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 2914998421..16dd00134d 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -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, |