forked from qt-creator/qt-creator
Utils: Remove CommandLine argument from QtcProcess::run{,Blocking}
Makes run() more similar to what start() looks like. Also add some asserts to make sure run() and related functions are only called on SyncronousProcesses, as these are currently the only ones where this works. Change-Id: Idee6076c3f40a484db5c17f5bb348698cc83d220 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -70,7 +70,8 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
|
||||
Environment env = AndroidConfigurations::toolsEnvironment(config);
|
||||
proc.setEnvironment(env);
|
||||
qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
|
||||
proc.runBlocking(cmd);
|
||||
proc.setCommand(cmd);
|
||||
proc.runBlocking();
|
||||
if (proc.result() == Utils::QtcProcess::Finished) {
|
||||
if (output)
|
||||
*output = proc.allOutput();
|
||||
@@ -201,7 +202,8 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
|
||||
qCDebug(avdManagerLog) << "Running command (removeAvd):" << command.toUserOutput();
|
||||
SynchronousProcess proc;
|
||||
proc.setTimeoutS(5);
|
||||
proc.runBlocking(command);
|
||||
proc.setCommand(command);
|
||||
proc.runBlocking();
|
||||
return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
|
||||
}
|
||||
|
||||
@@ -350,7 +352,8 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
|
||||
qCDebug(avdManagerLog) << "Running command (isAvdBooted):" << command.toUserOutput();
|
||||
SynchronousProcess adbProc;
|
||||
adbProc.setTimeoutS(10);
|
||||
adbProc.runBlocking(command);
|
||||
adbProc.setCommand(command);
|
||||
adbProc.runBlocking();
|
||||
if (adbProc.result() != QtcProcess::Finished)
|
||||
return false;
|
||||
QString value = adbProc.allOutput().trimmed();
|
||||
|
||||
Reference in New Issue
Block a user