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

Fix build

Browse Source 
Change-Id: I2edadc699c7177f3239a686dd01f92e54fa56bf9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2023-09-28 06:44:54 +02:00
parent 7a4e66992c
commit 4872532ef1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/baremetal/debugserverprovidermanager.cpp
View File

@@ -99,7 +99,7 @@ void DebugServerProviderManager::restoreProviders()
for (const Key &key : keys) { for (const Key &key : keys) {
const int lastDot = key.view().lastIndexOf('.'); const int lastDot = key.view().lastIndexOf('.');
if (lastDot != -1) if (lastDot != -1)
map[key.view().mid(lastDot + 1).toByteArray()] = map[key]; map[key.toByteArray().mid(lastDot + 1)] = map[key];
} }
bool restored = false; bool restored = false;
for (IDebugServerProviderFactory *f : std::as_const(m_factories)) { for (IDebugServerProviderFactory *f : std::as_const(m_factories)) {

2
src/plugins/debugger/debuggeractions.cpp
View File

@@ -292,7 +292,7 @@ QString DebuggerSettings::dump()
if (!key.isEmpty()) { if (!key.isEmpty()) {
const int pos = key.view().indexOf('/'); const int pos = key.view().indexOf('/');
if (pos >= 0) if (pos >= 0)
key = key.view().mid(pos).toByteArray(); key = key.toByteArray().mid(pos);
const QString current = aspect->variantValue().toString(); const QString current = aspect->variantValue().toString();
const QString default_ = aspect->defaultVariantValue().toString(); const QString default_ = aspect->defaultVariantValue().toString();
QString setting = stringFromKey(key) + ": " + current + " (default: " + default_ + ')'; QString setting = stringFromKey(key) + ": " + current + " (default: " + default_ + ')';

4
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -219,7 +219,7 @@ bool QtVersionManagerImpl::restoreQtVersions()
if (!key.view().startsWith(keyPrefix)) if (!key.view().startsWith(keyPrefix))
continue; continue;
bool ok; bool ok;
int count = key.view().mid(keyPrefix.count()).toInt(&ok); int count = key.toByteArray().mid(keyPrefix.count()).toInt(&ok);
if (!ok || count < 0) if (!ok || count < 0)
continue; continue;
@@ -293,7 +293,7 @@ void QtVersionManagerImpl::updateFromInstaller(bool emitSignal)
if (!key.view().startsWith(keyPrefix)) if (!key.view().startsWith(keyPrefix))
continue; continue;
bool ok; bool ok;
int count = key.view().mid(keyPrefix.count()).toInt(&ok); int count = key.toByteArray().mid(keyPrefix.count()).toInt(&ok);
if (!ok || count < 0) if (!ok || count < 0)
continue; continue;