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

Debugger: Fix build with Qt6

Browse Source 
QStringRef gone.
ViewOptions changed.
MetaType register stream operators automatically.

Task-number: QTCREATORBUG-24098
Change-Id: Ibf98561af951aa5fc4ec483d18dafeaad02e07c3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-18 13:05:37 +02:00
parent 3a602e8338
commit 2a70bc1d09
14 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ void BreakpointParameters::updateLocation(const QString &location)
{
if (!location.isEmpty()) {
int pos = location.indexOf(':');
lineNumber = location.midRef(pos + 1).toInt();
lineNumber = location.mid(pos + 1).toInt();
QString file = location.left(pos);
if (file.startsWith('"') && file.endsWith('"'))
file = file.mid(1, file.size() - 2);
@@ -156,9 +156,9 @@ bool BreakpointParameters::isQmlFileAndLineBreakpoint() const
if (qmlExtensionString.isEmpty())
qmlExtensionString = ".qml;.js";
const auto qmlFileExtensions = qmlExtensionString.splitRef(';', Qt::SkipEmptyParts);
const auto qmlFileExtensions = qmlExtensionString.split(';', Qt::SkipEmptyParts);
const QString file = fileName.toString();
for (const QStringRef &extension : qmlFileExtensions) {
for (const QString &extension : qmlFileExtensions) {
if (file.endsWith(extension, Qt::CaseInsensitive))
return true;
}
@@ -347,7 +347,7 @@ void BreakpointParameters::updateFromGdbOutput(const GdbMi &bkpt)
QString what = bkpt["what"].data();
if (what.startsWith("*0x")) {
type = WatchpointAtAddress;
address = what.midRef(1).toULongLong(nullptr, 0);
address = what.mid(1).toULongLong(nullptr, 0);
} else {
type = WatchpointAtExpression;
expression = what;