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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a
This commit is contained in:
Eike Ziller
2024-02-27 09:04:51 +01:00
parent 69a0f16547 fdabbfcbcf
commit a8414effd8
176 changed files with 3444 additions and 2000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/ios/devicectlutils.cpp
View File

@@ -46,7 +46,7 @@ expected_str<QJsonValue> parseDevicectlResult(const QByteArray &rawOutput)
}
const QJsonValue resultValue = jsonOutput["result"];
if (resultValue.isUndefined()) {
return make_unexpected(Tr::tr("Failed to parse devicectl output: 'result' is missing"));
return make_unexpected(Tr::tr("Failed to parse devicectl output: \"result\" is missing."));
}
return resultValue;
}

2
src/plugins/ios/iosrunner.cpp
View File

@@ -264,7 +264,7 @@ GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier)
void DeviceCtlRunner::reportStoppedImpl()
{
appendMessage(Tr::tr("\"%1\" exited").arg(m_bundlePath.toUserOutput()),
appendMessage(Tr::tr("\"%1\" exited.").arg(m_bundlePath.toUserOutput()),
Utils::NormalMessageFormat);
reportStopped();
}

8
src/plugins/ios/iossettingspage.cpp
View File

@@ -204,9 +204,11 @@ void IosSettingsWidget::onStart()
QList<QFuture<void>> futureList;
for (const SimulatorInfo &info : simulatorInfoList) {
if (!info.isShutdown()) {
statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3")
.arg(info.name).arg(info.runtimeName).arg(info.state),
Utils::StdErrFormat);
statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3.")
.arg(info.name)
.arg(info.runtimeName)
.arg(info.state),
Utils::StdErrFormat);
} else {
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::startSimulator(info.identifier), this,