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

iOS: Use QtcProcess

Browse Source 
Change-Id: I758a5de16d51124eeaff15385abae094df548096
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-08-25 13:46:27 +02:00
parent 49211c4a5c
commit 90a9185137
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,15 +100,15 @@ static bool runSimCtlCommand(QStringList args, QString *output, QString *allOutp
static bool launchSimulator(const QString &simUdid) { static bool launchSimulator(const QString &simUdid) {
QTC_ASSERT(!simUdid.isEmpty(), return false); QTC_ASSERT(!simUdid.isEmpty(), return false);
const QString simulatorAppPath = IosConfigurations::developerPath() const FilePath simulatorAppPath = IosConfigurations::developerPath()
.pathAppended("Applications/Simulator.app/Contents/MacOS/Simulator").toString(); .pathAppended("Applications/Simulator.app/Contents/MacOS/Simulator");
if (IosConfigurations::xcodeVersion() >= QVersionNumber(9)) { if (IosConfigurations::xcodeVersion() >= QVersionNumber(9)) {
// For XCode 9 boot the second device instead of launching simulator app twice. // For XCode 9 boot the second device instead of launching simulator app twice.
QString psOutput; QString psOutput;
if (runCommand({"ps", {"-A", "-o", "comm"}}, &psOutput)) { if (runCommand({"ps", {"-A", "-o", "comm"}}, &psOutput)) {
for (const QString &comm : psOutput.split('\n')) { for (const QString &comm : psOutput.split('\n')) {
if (comm == simulatorAppPath) if (comm == simulatorAppPath.toString())
return runSimCtlCommand({"boot", simUdid}, nullptr); return runSimCtlCommand({"boot", simUdid}, nullptr);
} }
} else { } else {
@@ -118,7 +118,7 @@ static bool launchSimulator(const QString &simUdid) {
} }
} }
return QProcess::startDetached(simulatorAppPath, {"--args", "-CurrentDeviceUDID", simUdid}); return QtcProcess::startDetached({simulatorAppPath, {"--args", "-CurrentDeviceUDID", simUdid}});
} }
static bool isAvailable(const QJsonObject &object) static bool isAvailable(const QJsonObject &object)