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

8
src/plugins/debugger/breakpoint.cpp
View File

@@ -142,7 +142,7 @@ void BreakpointParameters::updateLocation(const QString &location)
file = file.mid(1, file.size() - 2);
QFileInfo fi(file);
if (fi.isReadable())
fileName = fi.absoluteFilePath();
fileName = Utils::FilePath::fromFileInfo(fi);
}
}
@@ -156,8 +156,9 @@ bool BreakpointParameters::isQmlFileAndLineBreakpoint() const
qmlExtensionString = ".qml;.js";
const auto qmlFileExtensions = qmlExtensionString.splitRef(';', QString::SkipEmptyParts);
const QString file = fileName.toString();
for (const QStringRef &extension : qmlFileExtensions) {
if (fileName.endsWith(extension, Qt::CaseInsensitive))
if (file.endsWith(extension, Qt::CaseInsensitive))
return true;
}
return false;
@@ -377,7 +378,6 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt)
QString name;
if (!fullName.isEmpty()) {
name = cleanupFullName(fullName);
fileName = name;
//if (data->markerFileName().isEmpty())
// data->setMarkerFileName(name);
} else {
@@ -386,7 +386,7 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt)
// gdb's own. No point in assigning markerFileName for now.
}
if (!name.isEmpty())
fileName = name;
fileName = Utils::FilePath::fromString(name);
if (fileName.isEmpty())
updateLocation(originalLocation);