From 9025a9b2b14f213e7e5de33a2ff8a5addf433ef9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 23 Apr 2020 08:18:29 -0700 Subject: [PATCH] build-system/Android: update some dependency versions Qt 5.13.2 fixes a few bugs. We are NOT switching to Qt 5.14 as that breaks a ton of things with Android support. At this point even with qmake it near impossible to get working Android binaries, no one appears to have a solution for cmake. With qt-android-cmake current master fixes the problem that held us back at the earlier commit, so let's go back to using master. Signed-off-by: Dirk Hohndel --- packaging/android/variables.sh | 2 +- scripts/get-dep-lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 006fdd1fc..88d105756 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -2,7 +2,7 @@ # When changing Qt version remember to update the # qt-installer-noninteractive file as well. QT_VERSION=5.13 -LATEST_QT=5.13.1 +LATEST_QT=5.13.2 NDK_VERSION=r18b SDK_VERSION=4333796 ANDROID_BUILDTOOLS_REVISION=28.0.3 diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 0966d8de1..29bece843 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -17,7 +17,7 @@ CURRENT_KIRIGAMI="v5.62.0" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" CURRENT_GRANTLEE="v5.1.0" CURRENT_MDBTOOLS="master" -CURRENT_QT_ANDROID_CMAKE="e3bd0c4930dfa154cacb71d8960474ec00ceca4f" +CURRENT_QT_ANDROID_CMAKE="master" # Checkout library from git # Ensure specified version is checked out,