diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2017-02-06 15:55:39 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-06 21:15:08 -0800 |
| commit | 9d235d165ec435a20d55ddf2a7072bd255be060e (patch) | |
| tree | 2e9e9b3c5e77186bd1036aaeda0286ad2d352d09 | |
| parent | c345702d1b08b88ef25bdd2b28390045b9f74595 (diff) | |
| download | subsurface-9d235d165ec435a20d55ddf2a7072bd255be060e.tar.gz | |
android: Upgrade Qt to 5.8
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 4 | ||||
| -rw-r--r-- | packaging/android/build.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 02d80f1db..3db028452 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -14,8 +14,8 @@ USE_X=$(case "$-" in *x*) echo "-x" ;; esac) # these are the current versions for Qt, Android SDK & NDK: -QT_VERSION=5.7 -LATEST_QT=5.7.1 +QT_VERSION=5.8 +LATEST_QT=5.8.0 NDK_VERSION=r13b SDK_VERSION=r25.2.3 diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 0a705ba92..e271af28e 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -53,6 +53,8 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13 if [ ! -z "$QT5_ANDROID" ] ; then 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 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.7 elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then |