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: Upgrade Qt to 5.8

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2017-02-06 15:55:39 +01:00 • committed by Dirk Hohndel
parent c345702d1b
commit 9d235d165e
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

@ -14,8 +14,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.7 QT_VERSION=5.8
LATEST_QT=5.7.1 LATEST_QT=5.8.0
NDK_VERSION=r13b NDK_VERSION=r13b
SDK_VERSION=r25.2.3 SDK_VERSION=r25.2.3

2
packaging/android/build.sh
View file

@ -53,6 +53,8 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13
if [ ! -z "$QT5_ANDROID" ] ; then if [ ! -z "$QT5_ANDROID" ] ; then
echo "Using Qt5 in $QT5_ANDROID" echo "Using Qt5 in $QT5_ANDROID"
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.8" ] ; then
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.8
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.7" ] ; then elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.7" ] ; then
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.7 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.7
elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then