[PATCH 09/12] android: Upgrade Qt to 5.8

[Anton Lundin]

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 packaging/android/android-build-wrapper.sh | 4 ++--
 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 02d80f1..3db0284 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 0a705ba..e271af2 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
-- 
2.9.3