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

Debugger: make Location::fileName a Utils::FilePath

Browse Source 
Change-Id: I637d39246ff576db1023f08c432a7f7b6aadbbaa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2020-01-02 12:37:57 +01:00
parent a7dd0e50a2
commit b23d80d537
9 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1210,25 +1210,28 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
showMessage("INVALID STOPPED REASON", LogWarning);
}
const FilePath fileName = FilePath::fromString(fullName);
if (!nr.isEmpty() && frame.isValid()) {
// Use opportunity to update the breakpoint marker position.
if (Breakpoint bp = breakHandler()->findBreakpointByResponseId(nr)) {
FilePath fileName = bp->fileName();
if (fileName.isEmpty())
fileName = FilePath::fromString(fullName);
if (!fileName.isEmpty())
const FilePath &bpFileName = bp->fileName();
if (!bpFileName.isEmpty())
bp->setMarkerFileAndLine(bpFileName, lineNumber);
else if (!fileName.isEmpty())
bp->setMarkerFileAndLine(fileName, lineNumber);
}
}
//qDebug() << "BP " << rid << data.toString();
// Quickly set the location marker.
if (lineNumber && !operatesByInstruction()
&& QFileInfo::exists(fullName)
if (lineNumber
&& !operatesByInstruction()
&& fileName.exists()
&& function != "qt_v4TriggeredBreakpointHook"
&& function != "qt_qmlDebugMessageAvailable"
&& language != "js")
gotoLocation(Location(fullName, lineNumber));
gotoLocation(Location(fileName, lineNumber));
if (state() == InferiorRunOk) {
// Stop triggered by a breakpoint or otherwise not directly