From e6875aa01e755856192651424260675ae4d1211a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 18 May 2023 12:01:11 +0300 Subject: [PATCH] Android: don't stop deployment if kit's abis list is empty If the kit's detected abis list is empty for some reason, avoid blocking the deployment process. Fixes: QTCREATORBUG-27103 Change-Id: I9e7b01c123666f087c6d48e56af6e6637e147442 Reviewed-by: Reviewed-by: hjk --- src/plugins/android/androiddeployqtstep.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 84f0ffbbe59..f33ae5aa6b3 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -235,8 +235,7 @@ bool AndroidDeployQtStep::init() return false; } - const bool abiListNotEmpty = !selectedAbis.isEmpty() && !dev->supportedAbis().isEmpty(); - if (abiListNotEmpty && !dev->canSupportAbis(selectedAbis)) { + if (!dev->canSupportAbis(selectedAbis)) { const QString error = Tr::tr("The deployment device \"%1\" does not support the " "architectures used by the kit.\n" "The kit supports \"%2\", but the device uses \"%3\".")