mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: Move suggested/expected Qt install to just Qt

Browse source 
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@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2017-02-06 15:55:38 +01:00 • committed by Dirk Hohndel
parent 9f7c3c31f7
commit c345702d1b
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/android/android-build-wrapper.sh
View file

@ -53,19 +53,17 @@ fi
# download the Qt installer including Android bits and unpack / install # 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} 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 if [ ! -f ${QT_BINARIES} ] ; then
wget -q ${QT_DOWNLOAD_URL} wget -q ${QT_DOWNLOAD_URL}
fi 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} chmod +x ./${QT_BINARIES}
./${QT_BINARIES} ./${QT_BINARIES}
fi fi
[ -e Qt ] || ln -s Qt${LATEST_QT} Qt
# patch the cmake / Qt5.7.1 incompatibility mentioned above # 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 # next we need to get the Android SDK and NDK
if [ ! -d $ANDROID_NDK ] ; then if [ ! -d $ANDROID_NDK ] ; then

6
packaging/android/build.sh
View file

@ -7,15 +7,15 @@
# You need to have a version of Qt that contains the Android bits # You need to have a version of Qt that contains the Android bits
# installed. You should be able to find the correct installer for # installed. You should be able to find the correct installer for
# Linux or Mac here: # 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. # make sure you pick one with 'android' in its name.
# #
# Install this wherever you want - and then have a link named ~/src/Qt that # Install this wherever you want - and then have a link named ~/src/Qt that
# points to it. # 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 # (which I think is the default location), then simply do
# cd ~/src # 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 # you also need to have the current Android SDK and NDK installed under ~/src
# #