diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-04 09:13:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-05 08:19:31 -0700 |
| commit | ea0e447e0dec06a7063cbe435d7f8498d5a5fba7 (patch) | |
| tree | 1d0ed80a1f224d86b3fa4ce714b3fc04a9bdae4f /packaging | |
| parent | 44583734886db665ea3d5964a1b2705fe0a0f4b6 (diff) | |
| download | subsurface-ea0e447e0dec06a7063cbe435d7f8498d5a5fba7.tar.gz | |
builld-system: switch Android to Qt 5.13.1
This fixes the SSL issue with Android 5.x/Lollipop.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 4 | ||||
| -rw-r--r-- | packaging/android/variables.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index f54a354d3..4b679e519 100644 --- a/packaging/android/qt-installer-noninteractive.qs +++ b/packaging/android/qt-installer-noninteractive.qs @@ -32,8 +32,8 @@ Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); widget.deselectAll(); - widget.selectComponent('qt.qt5.5124.android_armv7'); - widget.selectComponent('qt.qt5.5124.android_arm64_v8a'); + widget.selectComponent('qt.qt5.5131.android_armv7'); + widget.selectComponent('qt.qt5.5131.android_arm64_v8a'); gui.clickButton(buttons.NextButton); } diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 0c1b589ac..a3c3dcdfc 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -1,8 +1,8 @@ #!/bin/bash # When changing Qt version remember to update the # qt-installer-noninteractive file as well. -QT_VERSION=5.12 -LATEST_QT=5.12.4 +QT_VERSION=5.13 +LATEST_QT=5.13.1 NDK_VERSION=r18b SDK_VERSION=4333796 ANDROID_BUILDTOOLS_REVISION=28.0.3 |