From 41a278a030f1aa1136d32fbdb8b4f6837c2b00ba Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Apr 2024 17:26:45 +0200 Subject: [PATCH] Android: Avoid duplicated "--sdk_root=[...]" arg The sdkManagerCommand() adds this arg already. Change-Id: Ibfc151cd5bd994bbbf92907955c93afd500abb3c Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/android/androidsdkmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 6dacf6d15fc..f859143badc 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -506,10 +506,10 @@ void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdPromise &fi) fi.setProgressValue(0); AndroidSdkManager::OperationOutput result; result.type = AndroidSdkManager::LicenseCheck; - const QStringList args = {"--licenses", sdkRootArg(androidConfig())}; if (!fi.isCanceled()) { const int timeOutS = 4; // Short timeout as workaround for QTCREATORBUG-25667 - sdkManagerCommand(androidConfig(), args, m_sdkManager, fi, result, 100.0, true, timeOutS); + sdkManagerCommand(androidConfig(), {"--licenses"}, m_sdkManager, fi, result, 100.0, true, + timeOutS); } else { qCDebug(sdkManagerLog) << "Update: Operation cancelled before start"; }