Build scripts: work with both Qt 5.5 and 5.6

This is all a bit hackish but seems to work

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

packaging/android/README

@@ -23,7 +23,7 @@ Step 1.
 Extract and install these into known directories.
 Have a look in the top of build.sh for where the cross build tool expects
 them. By default thats is: ../../../android-ndk-r9d ../../../android-sdk-linux
-and ../../../Qt/5.5
+and ../../../Qt/5.5 (or Qt/5.6)
 
 Step 2.
 Run bash build.sh in the terminal. By default it builds for arm but you

packaging/android/build.sh

@@ -20,7 +20,16 @@ fi
 
 # Configure where we can find things here
 export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
-export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
+
+if [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then
+	export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
+elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then
+	export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.6
+else
+	echo "Cannot find Qt 5.5 or 5.6 under $SUBSURFACE_SOURCE/../Qt"
+	exit 1
+fi
+
 if [ $PLATFORM = Darwin ] ; then
        export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-macosx
        export ANDROID_NDK_HOST=darwin-x86_64

scripts/build.sh

@@ -140,7 +140,14 @@ fi
 mkdir -p build
 cd build
 if [ $PLATFORM = Darwin ] ; then
-	export CMAKE_PREFIX_PATH=~/Qt/5.5/clang_64/lib/cmake
+	if [ -d "~/Qt/5.5" ] ; then
+		export CMAKE_PREFIX_PATH=~/Qt/5.5/clang_64/lib/cmake
+	elif [ -d "~/Qt/5.6" ] ; then
+		export CMAKE_PREFIX_PATH=~/Qt/5.6/clang_64/lib/cmake
+	else
+		echo "cannot find Qt 5.5 or 5.6 in ~/Qt"
+		exit 1
+	fi
 fi
 cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \
 	-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \