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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: I9c4ef46084fd392663c7c21c4ecdbc578ea28577
This commit is contained in:
Eike Ziller
2022-03-18 08:42:02 +01:00
parent 5454dda249 ab772c50be
commit e914f42458
12 changed files with 274 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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\".")