Android build script: update for Qt 5.9

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 9 insertions, 6 deletions

diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh
index dcc2ec493..527ee38b0 100644
--- a/packaging/android/android-build-wrapper.sh
+++ b/packaging/android/android-build-wrapper.sh
@@ -2,13 +2,16 @@
 
 # run this in the top level folder you want to create Android binaries in
 #
-# it seems that with Qt5.7.1 or Qt5.8 and current cmake there is an odd bug where
+# it seems that with Qt5.7 (and later) and current cmake there is an odd bug where
 # cmake fails reporting :No known features for CXX compiler "GNU". In that
 # case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)"
 # at line 101 of
 # Qt/5.7/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake 
 # or at line 95 of
 # Qt/5.8/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
+# or at line 105 of
+# Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
+# (this script tries to do this automatically)
 
 exec 1> >(tee ./build.log) 2>&1
 
@@ -16,8 +19,8 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac)
 
 # these are the current versions for Qt, Android SDK & NDK:
 
-QT_VERSION=5.8
-LATEST_QT=5.8.0
+QT_VERSION=5.9
+LATEST_QT=5.9.0
 NDK_VERSION=r13b
 SDK_VERSION=r25.2.3
 
@@ -31,7 +34,7 @@ export SUBSURFACE_SOURCE=$PWD
 popd
 
 if [ "$PLATFORM" = Linux ] ; then
-	QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run
+	QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run
 	NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip
 	SDK_TOOLS=tools_${SDK_VERSION}-linux.zip
 else
@@ -64,7 +67,7 @@ if [ ! -d Qt ] ; then
 		wget -q ${QT_DOWNLOAD_URL}
 	fi
 	chmod +x ./${QT_BINARIES}
-	./${QT_BINARIES} -platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
+	./${QT_BINARIES} --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
 fi
 
 # patch the cmake / Qt5.7.1 incompatibility mentioned above
diff --git a/qt-installer-noninteractive.qs b/qt-installer-noninteractive.qs
index b6c6c2a59..7ac079e30 100644
--- a/qt-installer-noninteractive.qs
+++ b/qt-installer-noninteractive.qs
@@ -32,7 +32,7 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
     var widget = gui.currentPageWidget();
 
     widget.selectAll();
-    widget.deselectComponent('qt.58.src');
+    widget.deselectComponent('qt.59.src');
 
     gui.clickButton(buttons.NextButton);
 }