[PATCH 08/12] android: Move suggested/expected Qt install to just Qt

[Anton Lundin]

In the Qt installer, there is a MaintenanceTool which can upgrade your
install, so don't install in a "versioned" directory, just install in a
plain Qt-directory.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 packaging/android/android-build-wrapper.sh | 8 +++-----
 packaging/android/build.sh                 | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh
index 6242809..02d80f1 100644
--- a/packaging/android/android-build-wrapper.sh
+++ b/packaging/android/android-build-wrapper.sh
@@ -53,19 +53,17 @@ fi
 
 # download the Qt installer including Android bits and unpack / install
 QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
-if [ ! -d Qt${LATEST_QT} ] ; then
+if [ ! -d Qt ] ; then
 	if [ ! -f ${QT_BINARIES} ] ; then
 		wget -q ${QT_DOWNLOAD_URL}
 	fi
-	echo "In the binary installer select $(pwd)/${LATEST_QT} as install directory"
+	echo "In the binary installer select $(pwd)/Qt as install directory"
 	chmod +x ./${QT_BINARIES}
 	./${QT_BINARIES}
 fi
 
-[ -e Qt ] || ln -s Qt${LATEST_QT} Qt
-
 # patch the cmake / Qt5.7.1 incompatibility mentioned above
-sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/5.7/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
+sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/${QT_VERSION}/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
 
 # next we need to get the Android SDK and NDK
 if [ ! -d $ANDROID_NDK ] ; then
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 3cfaf47..0a705ba 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -7,15 +7,15 @@
 # You need to have a version of Qt that contains the Android bits
 # installed. You should be able to find the correct installer for
 # Linux or Mac here:
-# http://download.qt.io/official_releases/qt/5.7/
+# http://download.qt.io/official_releases/qt/
 # make sure you pick one with 'android' in its name.
 #
 # Install this wherever you want - and then have a link named ~/src/Qt that
 # points to it.
-# So let's assume that you are installing the package above in ~/Qt5.7.1
+# So let's assume that you are installing the package above in ~/Qt
 # (which I think is the default location), then simply do
 # cd ~/src
-# ln -s ~/Qt5.7.1 Qt
+# ln -s ~/Qt Qt
 #
 # you also need to have the current Android SDK and NDK installed under ~/src
 #
-- 
2.9.3