Changeset c345702 in subsurface


Ignore:
Timestamp:
Feb 6, 2017, 9:14:53 PM (10 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
9d235d16
Parents:
9f7c3c31
git-author:
Anton Lundin <glance@…> (02/06/17 06:55:38)
git-committer:
Dirk Hohndel <dirk@…> (02/06/17 21:14:53)
Message:

android: Move suggested/expected Qt install to just Qt

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@…>
Signed-off-by: Dirk Hohndel <dirk@…>

Location:
packaging/android
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packaging/android/android-build-wrapper.sh

    r9f7c3c31 rc345702  
    5454# download the Qt installer including Android bits and unpack / install
    5555QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
    56 if [ ! -d Qt${LATEST_QT} ] ; then
     56if [ ! -d Qt ] ; then
    5757        if [ ! -f ${QT_BINARIES} ] ; then
    5858                wget -q ${QT_DOWNLOAD_URL}
    5959        fi
    60         echo "In the binary installer select $(pwd)/${LATEST_QT} as install directory"
     60        echo "In the binary installer select $(pwd)/Qt as install directory"
    6161        chmod +x ./${QT_BINARIES}
    6262        ./${QT_BINARIES}
    6363fi
    6464
    65 [ -e Qt ] || ln -s Qt${LATEST_QT} Qt
    66 
    6765# patch the cmake / Qt5.7.1 incompatibility mentioned above
    68 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
     66sed -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
    6967
    7068# next we need to get the Android SDK and NDK
  • packaging/android/build.sh

    r273550b rc345702  
    88# installed. You should be able to find the correct installer for
    99# Linux or Mac here:
    10 # http://download.qt.io/official_releases/qt/5.7/
     10# http://download.qt.io/official_releases/qt/
    1111# make sure you pick one with 'android' in its name.
    1212#
    1313# Install this wherever you want - and then have a link named ~/src/Qt that
    1414# points to it.
    15 # So let's assume that you are installing the package above in ~/Qt5.7.1
     15# So let's assume that you are installing the package above in ~/Qt
    1616# (which I think is the default location), then simply do
    1717# cd ~/src
    18 # ln -s ~/Qt5.7.1 Qt
     18# ln -s ~/Qt Qt
    1919#
    2020# you also need to have the current Android SDK and NDK installed under ~/src
Note: See TracChangeset for help on using the changeset viewer.