aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androidavdmanager.cpp18
-rw-r--r--src/plugins/android/androidbuildapkstep.cpp9
-rw-r--r--src/plugins/android/androidconfigurations.cpp30
-rw-r--r--src/plugins/android/androidcreatekeystorecertificate.cpp7
-rw-r--r--src/plugins/android/androiddeployqtstep.cpp6
-rw-r--r--src/plugins/android/androidmanager.cpp26
-rw-r--r--src/plugins/android/androidrunnerworker.cpp4
-rw-r--r--src/plugins/android/androidsdkmanager.cpp12
8 files changed, 56 insertions, 56 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 1d98ea6c036..151062ea55c 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -70,10 +70,10 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
Environment env = AndroidConfigurations::toolsEnvironment(config);
proc.setEnvironment(env);
qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
- SynchronousProcessResponse response = proc.runBlocking(cmd);
- if (response.result == Utils::SynchronousProcessResponse::Finished) {
+ proc.runBlocking(cmd);
+ if (proc.result() == Utils::QtcProcess::Finished) {
if (output)
- *output = response.allOutput();
+ *output = proc.allOutput();
return true;
}
return false;
@@ -199,10 +199,10 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
{
const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
qCDebug(avdManagerLog) << "Running command (removeAvd):" << command.toUserOutput();
- Utils::SynchronousProcess proc;
+ SynchronousProcess proc;
proc.setTimeoutS(5);
- const Utils::SynchronousProcessResponse response = proc.runBlocking(command);
- return response.result == Utils::SynchronousProcessResponse::Finished && response.exitCode == 0;
+ proc.runBlocking(command);
+ return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
}
static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)
@@ -350,10 +350,10 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
qCDebug(avdManagerLog) << "Running command (isAvdBooted):" << command.toUserOutput();
SynchronousProcess adbProc;
adbProc.setTimeoutS(10);
- const SynchronousProcessResponse response = adbProc.runBlocking(command);
- if (response.result != Utils::SynchronousProcessResponse::Finished)
+ adbProc.runBlocking(command);
+ if (adbProc.result() != QtcProcess::Finished)
return false;
- QString value = response.allOutput().trimmed();
+ QString value = adbProc.allOutput().trimmed();
return value == "stopped";
}
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index c05af5eb3f2..52304754df0 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -1007,14 +1007,13 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
const QStringList params = {"-list", "-v", "-keystore", m_keystorePath.toUserOutput(),
"-storepass", m_keystorePasswd, "-J-Duser.language=en"};
- Utils::SynchronousProcess keytoolProc;
+ SynchronousProcess keytoolProc;
keytoolProc.setTimeoutS(30);
- const SynchronousProcessResponse response
- = keytoolProc.run({AndroidConfigurations::currentConfig().keytoolPath(), params});
- if (response.result > Utils::SynchronousProcessResponse::FinishedError)
+ keytoolProc.run({AndroidConfigurations::currentConfig().keytoolPath(), params});
+ if (keytoolProc.result() > QtcProcess::FinishedError)
QMessageBox::critical(nullptr, tr("Error"), tr("Failed to run keytool."));
else
- model = new CertificatesModel(response.stdOut(), this);
+ model = new CertificatesModel(keytoolProc.stdOut(), this);
return model;
}
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 3251a0834a8..d987bc62a49 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -159,10 +159,10 @@ namespace {
SynchronousProcess proc;
proc.setProcessChannelMode(QProcess::MergedChannels);
proc.setTimeoutS(30);
- SynchronousProcessResponse response = proc.runBlocking({executable, {shell}});
- if (response.result != SynchronousProcessResponse::Finished)
+ proc.runBlocking({executable, {shell}});
+ if (proc.result() != QtcProcess::Finished)
return true;
- return !response.allOutput().contains("x86-64");
+ return !proc.allOutput().contains("x86-64");
}
}
return false;
@@ -561,14 +561,14 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
SynchronousProcess adbProc;
adbProc.setTimeoutS(30);
CommandLine cmd{adbToolPath, {"devices"}};
- SynchronousProcessResponse response = adbProc.runBlocking(cmd);
- if (response.result != SynchronousProcessResponse::Finished) {
+ adbProc.runBlocking(cmd);
+ if (adbProc.result() != QtcProcess::Finished) {
if (error)
*error = QApplication::translate("AndroidConfiguration", "Could not run: %1")
.arg(cmd.toUserOutput());
return devices;
}
- QStringList adbDevs = response.allOutput().split('\n', Qt::SkipEmptyParts);
+ QStringList adbDevs = adbProc.allOutput().split('\n', Qt::SkipEmptyParts);
if (adbDevs.empty())
return devices;
@@ -629,11 +629,11 @@ QString AndroidConfig::getDeviceProperty(const FilePath &adbToolPath, const QStr
SynchronousProcess adbProc;
adbProc.setTimeoutS(10);
- SynchronousProcessResponse response = adbProc.runBlocking(cmd);
- if (response.result != SynchronousProcessResponse::Finished)
+ adbProc.runBlocking(cmd);
+ if (adbProc.result() != QtcProcess::Finished)
return QString();
- return response.allOutput();
+ return adbProc.allOutput();
}
int AndroidConfig::getSDKVersion(const FilePath &adbToolPath, const QString &device)
@@ -726,11 +726,11 @@ QStringList AndroidConfig::getAbis(const FilePath &adbToolPath, const QString &d
arguments << "shell" << "getprop" << "ro.product.cpu.abilist";
SynchronousProcess adbProc;
adbProc.setTimeoutS(10);
- SynchronousProcessResponse response = adbProc.runBlocking({adbToolPath, arguments});
- if (response.result != SynchronousProcessResponse::Finished)
+ adbProc.runBlocking({adbToolPath, arguments});
+ if (adbProc.result() != QtcProcess::Finished)
return result;
- QString output = response.allOutput().trimmed();
+ QString output = adbProc.allOutput().trimmed();
if (!output.isEmpty()) {
QStringList result = output.split(QLatin1Char(','));
if (!result.isEmpty())
@@ -748,11 +748,11 @@ QStringList AndroidConfig::getAbis(const FilePath &adbToolPath, const QString &d
SynchronousProcess abiProc;
abiProc.setTimeoutS(10);
- SynchronousProcessResponse abiResponse = abiProc.runBlocking({adbToolPath, arguments});
- if (abiResponse.result != SynchronousProcessResponse::Finished)
+ abiProc.runBlocking({adbToolPath, arguments});
+ if (abiProc.result() != QtcProcess::Finished)
return result;
- QString abi = abiResponse.allOutput().trimmed();
+ QString abi = abiProc.allOutput().trimmed();
if (abi.isEmpty())
break;
result << abi;
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index 38405468b13..2423a9882e3 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -198,11 +198,12 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
SynchronousProcess genKeyCertProc;
genKeyCertProc.setTimeoutS(15);
- SynchronousProcessResponse response = genKeyCertProc.run(command);
+ genKeyCertProc.run(command);
- if (response.result != Utils::SynchronousProcessResponse::Finished || response.exitCode != 0) {
+ if (genKeyCertProc.result() != QtcProcess::Finished || genKeyCertProc.exitCode() != 0) {
QMessageBox::critical(this, tr("Error"),
- response.exitMessage(command.executable().toString(), 15) + '\n' + response.allOutput());
+ genKeyCertProc.exitMessage(command.executable().toString(), 15)
+ + '\n' + genKeyCertProc.allOutput());
return;
}
accept();
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 8b49d82ef36..20f76b8823c 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -481,9 +481,9 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command)
buildProc.setTimeoutS(2 * 60);
emit addOutput(tr("Package deploy: Running command \"%1\".").arg(command.toUserOutput()),
OutputFormat::NormalMessage);
- SynchronousProcessResponse response = buildProc.run(command);
- if (response.result != SynchronousProcessResponse::Finished || response.exitCode != 0) {
- const QString error = response.exitMessage(command.executable().toString(), 2 * 60);
+ buildProc.run(command);
+ if (buildProc.result() != QtcProcess::Finished || buildProc.exitCode() != 0) {
+ const QString error = buildProc.exitMessage(command.executable().toString(), 2 * 60);
emit addOutput(error, OutputFormat::ErrorMessage);
TaskHub::addTask(DeploymentTask(Task::Error, error));
}
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 33bdf5e1acd..d565884654e 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -538,8 +538,8 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
{"-list", "-keystore", keystorePath, "--storepass", keystorePasswd});
SynchronousProcess proc;
proc.setTimeoutS(10);
- SynchronousProcessResponse response = proc.run(cmd);
- return (response.result == SynchronousProcessResponse::Finished && response.exitCode == 0);
+ proc.run(cmd);
+ return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
}
bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd)
@@ -554,9 +554,8 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
SynchronousProcess proc;
proc.setTimeoutS(10);
- SynchronousProcessResponse response
- = proc.run({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
- return response.result == SynchronousProcessResponse::Finished && response.exitCode == 0;
+ proc.run({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
+ return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
}
bool AndroidManager::checkCertificateExists(const QString &keystorePath,
@@ -568,9 +567,8 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath,
SynchronousProcess proc;
proc.setTimeoutS(10);
- SynchronousProcessResponse response
- = proc.run({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
- return response.result == SynchronousProcessResponse::Finished && response.exitCode == 0;
+ proc.run({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
+ return proc.result() == QtcProcess::Finished && proc.exitCode() == 0;
}
using GradleProperties = QMap<QByteArray, QByteArray>;
@@ -724,15 +722,15 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command,
SynchronousProcess cmdProc;
cmdProc.setTimeoutS(timeoutS);
qCDebug(androidManagerLog) << "Running command (sync):" << command.toUserOutput();
- SynchronousProcessResponse response = cmdProc.run(command, writeData);
- cmdResult.m_stdOut = response.stdOut().trimmed();
- cmdResult.m_stdErr = response.stdErr().trimmed();
- cmdResult.m_success = response.result == SynchronousProcessResponse::Finished;
+ cmdProc.run(command, writeData);
+ cmdResult.m_stdOut = cmdProc.stdOut().trimmed();
+ cmdResult.m_stdErr = cmdProc.stdErr().trimmed();
+ cmdResult.m_success = cmdProc.result() == QtcProcess::Finished;
qCDebug(androidManagerLog) << "Command finshed (sync):" << command.toUserOutput()
<< "Success:" << cmdResult.m_success
- << "Output:" << response.allRawOutput();
+ << "Output:" << cmdProc.allRawOutput();
if (!cmdResult.success())
- cmdResult.m_exitMessage = response.exitMessage(command.executable().toString(), timeoutS);
+ cmdResult.m_exitMessage = cmdProc.exitMessage(command.executable().toString(), timeoutS);
return cmdResult;
}
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 6aa1c425a9c..3574f38759a 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -137,7 +137,9 @@ static void findProcessPID(QFutureInterface<qint64> &fi, QStringList selector,
chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
do {
QThread::msleep(200);
- const auto out = SynchronousProcess().runBlocking({adbPath, args}).allRawOutput();
+ SynchronousProcess proc;
+ proc.runBlocking({adbPath, args});
+ const QByteArray out = proc.allRawOutput();
if (preNougat) {
processPID = extractPID(out, packageName);
} else {
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 64da75bdb0a..71629c3067b 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -149,10 +149,10 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));
proc.setTimeoutS(timeout);
proc.setTimeOutMessageBoxEnabled(true);
- SynchronousProcessResponse response = proc.run({config.sdkManagerToolPath(), newArgs});
+ proc.run({config.sdkManagerToolPath(), newArgs});
if (output)
- *output = response.allOutput();
- return response.result == SynchronousProcessResponse::Finished;
+ *output = proc.allOutput();
+ return proc.result() == QtcProcess::Finished;
}
/*!
@@ -189,15 +189,15 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations,
&proc, &SynchronousProcess::stopProcess);
}
- SynchronousProcessResponse response = proc.run({config.sdkManagerToolPath(), newArgs});
+ proc.run({config.sdkManagerToolPath(), newArgs});
if (assertionFound) {
output.success = false;
- output.stdOutput = response.stdOut();
+ output.stdOutput = proc.stdOut();
output.stdError = QCoreApplication::translate("Android::Internal::AndroidSdkManager",
"The operation requires user interaction. "
"Use the \"sdkmanager\" command-line tool.");
} else {
- output.success = response.result == SynchronousProcessResponse::Finished;
+ output.success = proc.result() == QtcProcess::Finished;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 03:38:31 +0000