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: use Qt 5.9.3

Browse source 
At least, now the Travis builds use the same Qt version as the
production builds from Dirk that go to the AppStores.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-02-23 14:01:52 +01:00 • committed by Dirk Hohndel
parent f08e24d65b
commit 7e0e87cf78
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ 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.9
LATEST_QT=5.9.1 LATEST_QT=5.9.3
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.9.3" ] ; then
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
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.1 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.1
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then