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

iOS: Improve error message when installation on Simulator fails

Browse Source 
In case of error, post the output of the simctl command in compile
output and issues pane.

Fixes: QTCREATORBUG-25833
Change-Id: I62a0f7b10b5188a7c8b4e1db543b66d0661d4e6a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Eike Ziller
2024-07-19 11:59:32 +02:00
parent c895f67b6a
commit 84cc7208de
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,10 +54,12 @@ public:
int progress, int maxProgress, const QString &info) { int progress, int maxProgress, const QString &info) {
emit progressValueChanged(progress * 100 / maxProgress, info); emit progressValueChanged(progress * 100 / maxProgress, info);
}); });
connect(m_toolHandler.get(), &IosToolHandler::errorMsg, this, connect(
m_toolHandler.get(),
&IosToolHandler::errorMsg,
this,
[this](IosToolHandler *, const QString &message) { [this](IosToolHandler *, const QString &message) {
if (message.contains(QLatin1String("AMDeviceInstallApplication returned -402653103"))) TaskHub::addTask(DeploymentTask(Task::Error, message));
TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("The Info.plist might be incorrect.")));
emit errorMessage(message); emit errorMessage(message);
}); });
connect(m_toolHandler.get(), &IosToolHandler::didTransferApp, this, connect(m_toolHandler.get(), &IosToolHandler::didTransferApp, this,

10
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -484,10 +484,14 @@ void installApp(QPromise<SimulatorControl::Response> &promise,
nullptr, nullptr,
&response.commandOutput, &response.commandOutput,
[&promise] { return promise.isCanceled(); }); [&promise] { return promise.isCanceled(); });
if (!result) if (!result) {
promise.addResult(make_unexpected(result.error())); const QString error = result.error().isEmpty()
else ? response.commandOutput
: (result.error() + "\n" + response.commandOutput);
promise.addResult(make_unexpected(error));
} else {
promise.addResult(response); promise.addResult(response);
}
} }
void launchApp(QPromise<SimulatorControl::Response> &promise, void launchApp(QPromise<SimulatorControl::Response> &promise,