diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 45dce5bacc1..5886c395efb 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -75,12 +75,10 @@ static bool runCommand(QString command, const QStringList &args, QByteArray *out return resp.result == Utils::SynchronousProcessResponse::Finished; } -static QByteArray runSimCtlCommand(QStringList args) +static bool runSimCtlCommand(QStringList args, QByteArray *output) { - QByteArray output; args.prepend(QStringLiteral("simctl")); - runCommand(QStringLiteral("xcrun"), args, &output); - return output; + return runCommand(QStringLiteral("xcrun"), args, output); } class SimulatorControlPrivate { @@ -133,7 +131,8 @@ QList SimulatorControl::availableSimulators() static QList getAvailableSimulators() { QList availableDevices; - const QByteArray output = runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")}); + QByteArray output; + runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")}, &output); QJsonDocument doc = QJsonDocument::fromJson(output); if (!doc.isNull()) { const QJsonObject buildInfo = doc.object().value("devices").toObject(); @@ -219,7 +218,8 @@ SimulatorControlPrivate::SimDeviceInfo SimulatorControlPrivate::deviceInfo(const SimDeviceInfo info; bool found = false; if (!simUdid.isEmpty()) { - const QByteArray output = runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")}); + QByteArray output; + runSimCtlCommand({QLatin1String("list"), QLatin1String("-j"), QLatin1String("devices")}, &output); QJsonDocument doc = QJsonDocument::fromJson(output); if (!doc.isNull()) { const QJsonObject buildInfo = doc.object().value(QStringLiteral("devices")).toObject(); @@ -331,14 +331,12 @@ void SimulatorControlPrivate::installApp(QFutureInterface &fi, @@ -365,11 +363,12 @@ void SimulatorControlPrivate::launchApp(QFutureInterface