diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-02-23 14:01:52 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-02-24 11:37:56 -0800 |
| commit | 7e0e87cf785d0136dcde96c4a23b51c866cc664c (patch) | |
| tree | 1b0e7829e4619f4d14347ce8994f3fa4fd7e5cfd | |
| parent | f08e24d65bc0dbd7b5f274e9aa4d4af89edf4887 (diff) | |
| download | subsurface-7e0e87cf785d0136dcde96c4a23b51c866cc664c.tar.gz | |
Android build: use Qt 5.9.3
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>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 | ||||
| -rwxr-xr-x | packaging/android/build.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index cbbdb8d9b..51ef83f64 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -22,7 +22,7 @@ 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.1 +LATEST_QT=5.9.3 NDK_VERSION=r14b SDK_VERSION=3859397 # if you change this version, you'll likely have to change the android-sdk-license key fallback below diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 281eb5c9a..dea5cb6fe 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -80,6 +80,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.3" ] ; then + export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.3 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 |