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

Android build: switch to Qt 5.10.1

Browse source 
That's what we now use for the official binaries as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-03-19 12:08:06 -07:00
parent 6c3cd24ef8
commit 0c91a1b8d2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/android/android-build-wrapper.sh
View file

@ -21,8 +21,8 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac)
# these are the current versions for Qt, Android SDK & NDK: # these are the current versions for Qt, Android SDK & NDK:
QT_VERSION=5.9 QT_VERSION=5.10
LATEST_QT=5.9.3 LATEST_QT=5.10.1
NDK_VERSION=r14b NDK_VERSION=r14b
SDK_VERSION=3859397 # if you change this version, you'll likely have to change the android-sdk-license key fallback below SDK_VERSION=3859397 # if you change this version, you'll likely have to change the android-sdk-license key fallback below

2
packaging/android/build.sh
View file

@ -80,6 +80,8 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14
if [ -n "${QT5_ANDROID+X}" ] ; then if [ -n "${QT5_ANDROID+X}" ] ; then
echo "Using Qt5 in $QT5_ANDROID" echo "Using Qt5 in $QT5_ANDROID"
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.10.1" ] ; then
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.10.1
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.3" ] ; then elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.3" ] ; then
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.3 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.3
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.1" ] ; then elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.1" ] ; then