forked from qt-creator/qt-creator
QtcProcess: Get rid of setProcessUserEventWhileRunning()
Introduce EventLoopMode enum and pass it to the QtcProcess::runBlocking() instead. There is no need to store this setting. By default this value is NoEventLoop. Change-Id: Icad98b77bec5280b79039b7e5aa4ec408261521c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -1061,8 +1061,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
|
||||
QtcProcess keytoolProc;
|
||||
keytoolProc.setTimeoutS(30);
|
||||
keytoolProc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), params});
|
||||
keytoolProc.setProcessUserEventWhileRunning();
|
||||
keytoolProc.runBlocking();
|
||||
keytoolProc.runBlocking(QtcProcess::WithEventLoop);
|
||||
if (keytoolProc.result() > QtcProcess::FinishedWithError)
|
||||
QMessageBox::critical(nullptr, tr("Error"), tr("Failed to run keytool."));
|
||||
else
|
||||
|
||||
@@ -199,8 +199,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
|
||||
QtcProcess genKeyCertProc;
|
||||
genKeyCertProc.setTimeoutS(15);
|
||||
genKeyCertProc.setCommand(command);
|
||||
genKeyCertProc.setProcessUserEventWhileRunning();
|
||||
genKeyCertProc.runBlocking();
|
||||
genKeyCertProc.runBlocking(QtcProcess::WithEventLoop);
|
||||
|
||||
if (genKeyCertProc.result() != QtcProcess::FinishedWithSuccess) {
|
||||
QMessageBox::critical(this, tr("Error"),
|
||||
|
||||
@@ -527,8 +527,7 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command)
|
||||
OutputFormat::NormalMessage);
|
||||
|
||||
buildProc.setCommand(command);
|
||||
buildProc.setProcessUserEventWhileRunning();
|
||||
buildProc.runBlocking();
|
||||
buildProc.runBlocking(QtcProcess::WithEventLoop);
|
||||
if (buildProc.result() != QtcProcess::FinishedWithSuccess)
|
||||
reportWarningOrError(buildProc.exitMessage(), Task::Error);
|
||||
}
|
||||
|
||||
@@ -591,8 +591,7 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
|
||||
QtcProcess proc;
|
||||
proc.setTimeoutS(10);
|
||||
proc.setCommand(cmd);
|
||||
proc.setProcessUserEventWhileRunning();
|
||||
proc.runBlocking();
|
||||
proc.runBlocking(QtcProcess::WithEventLoop);
|
||||
return proc.result() == QtcProcess::FinishedWithSuccess;
|
||||
}
|
||||
|
||||
@@ -609,8 +608,7 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
|
||||
QtcProcess proc;
|
||||
proc.setTimeoutS(10);
|
||||
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
|
||||
proc.setProcessUserEventWhileRunning();
|
||||
proc.runBlocking();
|
||||
proc.runBlocking(QtcProcess::WithEventLoop);
|
||||
return proc.result() == QtcProcess::FinishedWithSuccess;
|
||||
}
|
||||
|
||||
@@ -624,8 +622,7 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath,
|
||||
QtcProcess proc;
|
||||
proc.setTimeoutS(10);
|
||||
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
|
||||
proc.setProcessUserEventWhileRunning();
|
||||
proc.runBlocking();
|
||||
proc.runBlocking(QtcProcess::WithEventLoop);
|
||||
return proc.result() == QtcProcess::FinishedWithSuccess;
|
||||
}
|
||||
|
||||
@@ -780,8 +777,7 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command,
|
||||
cmdProc.setWriteData(writeData);
|
||||
qCDebug(androidManagerLog) << "Running command (sync):" << command.toUserOutput();
|
||||
cmdProc.setCommand(command);
|
||||
cmdProc.setProcessUserEventWhileRunning();
|
||||
cmdProc.runBlocking();
|
||||
cmdProc.runBlocking(QtcProcess::WithEventLoop);
|
||||
cmdResult.m_stdOut = cmdProc.stdOut().trimmed();
|
||||
cmdResult.m_stdErr = cmdProc.stdErr().trimmed();
|
||||
cmdResult.m_success = cmdProc.result() == QtcProcess::FinishedWithSuccess;
|
||||
|
||||
@@ -136,8 +136,7 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
|
||||
proc.setTimeoutS(timeout);
|
||||
proc.setTimeOutMessageBoxEnabled(true);
|
||||
proc.setCommand({config.sdkManagerToolPath(), newArgs});
|
||||
proc.setProcessUserEventWhileRunning();
|
||||
proc.runBlocking();
|
||||
proc.runBlocking(QtcProcess::WithEventLoop);
|
||||
if (output)
|
||||
*output = proc.allOutput();
|
||||
return proc.result() == QtcProcess::FinishedWithSuccess;
|
||||
@@ -178,8 +177,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
|
||||
&proc, &QtcProcess::stopProcess);
|
||||
}
|
||||
proc.setCommand({config.sdkManagerToolPath(), newArgs});
|
||||
proc.setProcessUserEventWhileRunning();
|
||||
proc.runBlocking();
|
||||
proc.runBlocking(QtcProcess::WithEventLoop);
|
||||
if (assertionFound) {
|
||||
output.success = false;
|
||||
output.stdOutput = proc.stdOut();
|
||||
|
||||
Reference in New Issue
Block a user