diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-03-19 12:08:06 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-03-19 12:08:06 -0700 |
| commit | 0c91a1b8d20c2536d60adee7730dd435c1f7cdd9 (patch) | |
| tree | f9f26606cd8fdf1eb7de938e50fb222eae766cb9 | |
| parent | 6c3cd24ef883d7c84af5c801a4a11df4fc0bb963 (diff) | |
| download | subsurface-0c91a1b8d20c2536d60adee7730dd435c1f7cdd9.tar.gz | |
Android build: switch to Qt 5.10.1
That's what we now use for the official binaries as well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | 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 51ef83f64..2349bada8 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -21,8 +21,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.3 +QT_VERSION=5.10 +LATEST_QT=5.10.1 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 64e0ceb7e..cf42d9c57 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.10.1" ] ; then + export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.10.1 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 |