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

Utils: Rename QtcProcess::Result::Finished to FinishedWithSuccess

Browse Source 
To make clear that this is not just any finish.

Also change FinishedError to FinishedWithError, to create
symmetry.

Also adapt enum member description to reality.

Change-Id: I13e05391eb86fdb24e2ae660f14dfddb282e1104
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-28 13:19:38 +02:00
parent 08040e4e94
commit 0ba4338467
45 changed files with 139 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidconfigurations.cpp
View File

@@ -161,7 +161,7 @@ namespace {
proc.setTimeoutS(30);
proc.setCommand({executable, {shell}});
proc.runBlocking();
if (proc.result() != QtcProcess::Finished)
if (proc.result() != QtcProcess::FinishedWithSuccess)
return true;
return !proc.allOutput().contains("x86-64");
}
@@ -565,7 +565,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
CommandLine cmd{adbToolPath, {"devices"}};
adbProc.setCommand(cmd);
adbProc.runBlocking();
if (adbProc.result() != QtcProcess::Finished) {
if (adbProc.result() != QtcProcess::FinishedWithSuccess) {
if (error)
*error = QApplication::translate("AndroidConfiguration", "Could not run: %1")
.arg(cmd.toUserOutput());
@@ -634,7 +634,7 @@ QString AndroidConfig::getDeviceProperty(const FilePath &adbToolPath, const QStr
adbProc.setTimeoutS(10);
adbProc.setCommand(cmd);
adbProc.runBlocking();
if (adbProc.result() != QtcProcess::Finished)
if (adbProc.result() != QtcProcess::FinishedWithSuccess)
return QString();
return adbProc.allOutput();
@@ -732,7 +732,7 @@ QStringList AndroidConfig::getAbis(const FilePath &adbToolPath, const QString &d
adbProc.setTimeoutS(10);
adbProc.setCommand({adbToolPath, arguments});
adbProc.runBlocking();
if (adbProc.result() != QtcProcess::Finished)
if (adbProc.result() != QtcProcess::FinishedWithSuccess)
return result;
QString output = adbProc.allOutput().trimmed();
@@ -755,7 +755,7 @@ QStringList AndroidConfig::getAbis(const FilePath &adbToolPath, const QString &d
abiProc.setTimeoutS(10);
abiProc.setCommand({adbToolPath, arguments});
abiProc.runBlocking();
if (abiProc.result() != QtcProcess::Finished)
if (abiProc.result() != QtcProcess::FinishedWithSuccess)
return result;
QString abi = abiProc.allOutput().trimmed();