diff options
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 4 | ||||
| -rw-r--r-- | packaging/android/variables.sh | 6 | ||||
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index 4cfa65208..f54a354d3 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.5120.android_armv7'); - widget.selectComponent('qt.qt5.5120.android_arm64_v8a'); + widget.selectComponent('qt.qt5.5124.android_armv7'); + widget.selectComponent('qt.qt5.5124.android_arm64_v8a'); gui.clickButton(buttons.NextButton); } diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 49802cc8e..0c1b589ac 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -2,10 +2,10 @@ # When changing Qt version remember to update the # qt-installer-noninteractive file as well. QT_VERSION=5.12 -LATEST_QT=5.12.0 +LATEST_QT=5.12.4 NDK_VERSION=r18b SDK_VERSION=4333796 -ANDROID_BUILDTOOLS_REVISION=28.0.2 +ANDROID_BUILDTOOLS_REVISION=28.0.3 ANDROID_PLATFORM_LEVEL=21 ANDROID_PLATFORM=android-21 ANDROID_PLATFORMS=android-27 @@ -13,4 +13,4 @@ ANDROID_NDK=android-ndk-${NDK_VERSION} ANDROID_SDK=android-sdk-linux # OpenSSL also has an entry in get-dep-lib.sh line 103 # that needs to be updated as well. -OPENSSL_VERSION=1.0.2o +OPENSSL_VERSION=1.1.1c diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index ccda4bcb7..1387b2293 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -103,7 +103,7 @@ fi # FIX FOR ANDROID, if [ "$PLATFORM" == "singleAndroid" ] ; then - CURRENT_OPENSSL="OpenSSL_1_0_2o" + CURRENT_OPENSSL="OpenSSL_1_1_1c" # If changing the openSSL version here, make sure to change it in versions.sh also. fi # no curl and old libs (never version breaks) |