diff options
author | Jarek Kobus <[email protected]> | 2024-05-03 10:29:35 +0200 |
---|---|---|
committer | Jarek Kobus <[email protected]> | 2024-05-03 15:29:29 +0000 |
commit | d356257bd6dd12608aa2be50993ac924bc8dc63a (patch) | |
tree | e77ac45ef46fde2ef1e6852daea661747b531490 /src/plugins/android/androidsdkmanager.cpp | |
parent | 5af69018f6be269ec38b30fd36399ec1298a730e (diff) |
Android: Run Process asynchronously from the main thread
Instead of running it blocking from a separate thread.
Change-Id: Ia971395faf7d34062ab4bcfa91082c0bf77cdccf
Reviewed-by: <[email protected]>
Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/android/androidsdkmanager.cpp')
-rw-r--r-- | src/plugins/android/androidsdkmanager.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 437719e33ab..ed1ca4af9cf 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -11,7 +11,6 @@ #include <solutions/tasking/tasktreerunner.h> #include <utils/algorithm.h> -#include <utils/async.h> #include <utils/layoutbuilder.h> #include <utils/outputformatter.h> #include <utils/qtcprocess.h> @@ -27,7 +26,6 @@ namespace { Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg) -const char commonArgsKey[] = "Common Arguments:"; } using namespace Tasking; @@ -498,31 +496,6 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar return proc.result() == ProcessResult::FinishedWithSuccess; } -static void parseCommonArguments(QPromise<QString> &promise) -{ - QString argumentDetails; - QString output; - sdkManagerCommand(androidConfig(), QStringList("--help"), &output); - bool foundTag = false; - const auto lines = output.split('\n'); - for (const QString& line : lines) { - if (promise.isCanceled()) - break; - if (foundTag) - argumentDetails.append(line + "\n"); - else if (line.startsWith(commonArgsKey)) - foundTag = true; - } - - if (!promise.isCanceled()) - promise.addResult(argumentDetails); -} - -QFuture<QString> AndroidSdkManager::availableArguments() const -{ - return Utils::asyncRun(parseCommonArguments); -} - AndroidSdkManagerPrivate::AndroidSdkManagerPrivate(AndroidSdkManager &sdkManager) : m_sdkManager(sdkManager) {} |