diff options
author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-04-29 12:18:33 +0200 |
---|---|---|
committer | Raphaƫl Cotty <raphael.cotty@gmail.com> | 2022-02-09 22:21:11 +0000 |
commit | 2d5a48b4beaad63b82ddc00c2cad0a5226f2a898 (patch) | |
tree | 333dce8bbb954dca14448fdaf78089be35499af9 /scripts | |
parent | 06fd63d8ef2e45b31a58e6ed674d78c3bc677f4a (diff) | |
download | qbs-2d5a48b4beaad63b82ddc00c2cad0a5226f2a898.tar.gz |
Android: Allow to generate multi-arch package with Qt >= 6.3
In Qt 6.0, android installation was split in different directories
and the androiddeployqt could not work with multiple install dir.
This is fixed in Qt 6.3.0 and requires this change to call
androiddeployqt.
Change-Id: Ia402950fb835e956045ec28a9896c0b5cafbd9e8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/test-qt-for-android.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/test-qt-for-android.sh b/scripts/test-qt-for-android.sh index ae1338fb2..dcc52bc27 100755 --- a/scripts/test-qt-for-android.sh +++ b/scripts/test-qt-for-android.sh @@ -70,6 +70,12 @@ if [ ! "${QT_VERSION}" \< "5.14.0" ] && [ "${QT_VERSION}" \< "6.0.0" ]; then tst_blackbox-android fi; +if [ ! "${QT_VERSION}" \< "6.3.0" ]; then + echo "Using multi-arch data sets for qml tests (only for qt version >= 6.3.0) with all architectures" + qbs config --list + tst_blackbox-android +fi; + echo "Using single-arch (armv7a) data sets for qml tests" qbs config --unset profiles.qbs_autotests-android-qt.qbs.architectures qbs config profiles.qbs_autotests-android-qt.qbs.architecture armv7a |