diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-23 15:22:02 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:02:39 +1300 |
| commit | 247513ad0894d48802b362e35d43418c63133254 (patch) | |
| tree | bed6974ca2c8859ea8b70be581078100dda021dc /packaging/android | |
| parent | 94fa9358183464297e05fcd68aeb293e1c80a1ba (diff) | |
| download | subsurface-247513ad0894d48802b362e35d43418c63133254.tar.gz | |
Android: update for Qt 5.12.0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 | ||||
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index e6b43d1e4..e673b39e8 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -121,7 +121,7 @@ if [ ! -d Qt/"${LATEST_QT}"/android_armv7 ] ; then $SLOW_PROG wget -q "${QT_DOWNLOAD_URL}" fi chmod +x ./"${QT_BINARIES}" - ./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations -v + ./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations fi # patch the cmake / Qt5.7.1 incompatibility mentioned above diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index b0ec88022..4cfa65208 100644 --- a/packaging/android/qt-installer-noninteractive.qs +++ b/packaging/android/qt-installer-noninteractive.qs @@ -32,7 +32,8 @@ Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); widget.deselectAll(); - widget.selectComponent('qt.qt5.5111.android_armv7'); + widget.selectComponent('qt.qt5.5120.android_armv7'); + widget.selectComponent('qt.qt5.5120.android_arm64_v8a'); gui.clickButton(buttons.NextButton); } |