mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system/Android: update some dependency versions

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-04-23 08:18:29 -07:00
parent 999cc2d642
commit 9025a9b2b1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/variables.sh
View file

@ -2,7 +2,7 @@
# When changing Qt version remember to update the # When changing Qt version remember to update the
# qt-installer-noninteractive file as well. # qt-installer-noninteractive file as well.
QT_VERSION=5.13 QT_VERSION=5.13
LATEST_QT=5.13.1 LATEST_QT=5.13.2
NDK_VERSION=r18b NDK_VERSION=r18b
SDK_VERSION=4333796 SDK_VERSION=4333796
ANDROID_BUILDTOOLS_REVISION=28.0.3 ANDROID_BUILDTOOLS_REVISION=28.0.3

2
scripts/get-dep-lib.sh
View file

@ -17,7 +17,7 @@ CURRENT_KIRIGAMI="v5.62.0"
CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02"
CURRENT_GRANTLEE="v5.1.0" CURRENT_GRANTLEE="v5.1.0"
CURRENT_MDBTOOLS="master" CURRENT_MDBTOOLS="master"
CURRENT_QT_ANDROID_CMAKE="e3bd0c4930dfa154cacb71d8960474ec00ceca4f" CURRENT_QT_ANDROID_CMAKE="master"
# Checkout library from git # Checkout library from git
# Ensure specified version is checked out, # Ensure specified version is checked out,