From 03abdcda9fe63dc23de7d02723872a301b79e8ca Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 14 Mar 2022 18:46:15 +0200 Subject: [PATCH] Android: don't fail if device abi list is empty If for some reason the device abi list is empty, don't stop the deployment, let it continue and potentially fail later. Amends c1512dce879ce0fd2c5d45858c3af8f3493f658e. Task-number: QTCREATORBUG-27103 Change-Id: I484fbd1ddb365d5e96686eebc3ba76032684e506 Reviewed-by: Alessandro Portale --- src/plugins/android/androiddeployqtstep.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 69b57651445..89ea6de806a 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -182,7 +182,8 @@ bool AndroidDeployQtStep::init() return false; } - if (!selectedAbis.isEmpty() && !dev->canSupportAbis(selectedAbis)) { + const bool abiListNotEmpty = !selectedAbis.isEmpty() && !dev->supportedAbis().isEmpty(); + if (abiListNotEmpty && !dev->canSupportAbis(selectedAbis)) { const QString error = tr("The deployment device \"%1\" does not support the " "architectures used by the kit.\n" "The kit supports \"%2\", but the device uses \"%3\".")