feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: don't stop deployment if kit's abis list is empty

Browse Source 
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: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2023-05-18 12:01:11 +03:00
parent c098b261dc
commit e6875aa01e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -235,8 +235,7 @@ bool AndroidDeployQtStep::init()
return false; return false;
} }
const bool abiListNotEmpty = !selectedAbis.isEmpty() && !dev->supportedAbis().isEmpty(); if (!dev->canSupportAbis(selectedAbis)) {
if (abiListNotEmpty && !dev->canSupportAbis(selectedAbis)) {
const QString error = Tr::tr("The deployment device \"%1\" does not support the " const QString error = Tr::tr("The deployment device \"%1\" does not support the "
"architectures used by the kit.\n" "architectures used by the kit.\n"
"The kit supports \"%2\", but the device uses \"%3\".") "The kit supports \"%2\", but the device uses \"%3\".")