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 <[email protected]>
Reviewed-by: hjk <[email protected]>
Reviewed-by: <[email protected]>

1 files changed, 4 insertions, 8 deletions

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 049de020b0f..a256bf43c7b 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -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;