diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-30 16:57:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-06-30 17:21:07 -0700 |
| commit | 6451adfec11262c3522878e700cb6794df8ee3d2 (patch) | |
| tree | 0d6fcfde699a379ae65261df05c1880b5e5ce252 | |
| parent | 4604b6a8de4daa31c2be406a66dab9dc3b0435e7 (diff) | |
| download | subsurface-6451adfec11262c3522878e700cb6794df8ee3d2.tar.gz | |
Android build: switch to Qt 5.9.1
It seems that the Qt team deviated from their previous practice to keep
the Qt/x.y directory structure the same for all minor releases - so now
it is indeed Qt/5.9.1
Oh well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 4 | ||||
| -rwxr-xr-x | 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 f92503eac..af923a1c4 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -19,8 +19,8 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac) # these are the current versions for Qt, Android SDK & NDK: -QT_VERSION=5.9 -LATEST_QT=5.9.0 +QT_VERSION=5.9.1 +LATEST_QT=5.9.1 NDK_VERSION=r14b SDK_VERSION=r25.2.3 diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 06e7d5e02..d0c48e725 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -76,6 +76,8 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14 if [ -n "${QT5_ANDROID+X}" ] ; then echo "Using Qt5 in $QT5_ANDROID" +elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.1" ] ; then + export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.1 elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9 elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.8" ] ; then |