diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-02-23 11:56:39 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-02-23 17:21:51 +0000 |
| commit | c1512dce879ce0fd2c5d45858c3af8f3493f658e (patch) | |
| tree | ba16a01e5a15084d3d3d57ab52291da6f57b1f30 | |
| parent | 0586418f8349f3ed5b36dfdc7efec75b4b17a284 (diff) | |
| download | qt-creator-c1512dce879ce0fd2c5d45858c3af8f3493f658e.tar.gz | |
Android: don't stop deployment if the kit's ABIs list is empty
If for some reason we cannot get the list of kit's ABIs or it's not set,
don't stop the deployment because of that, let it continue and fail
later.
Fixes: QTCREATORBUG-27103
Change-Id: I973e5ffdca1e8fb6af3f6e6438969b38b8e375c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 1d76083a6e..69b5765144 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -182,7 +182,7 @@ bool AndroidDeployQtStep::init() return false; } - if (!dev->canSupportAbis(selectedAbis)) { + if (!selectedAbis.isEmpty() && !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\".") |