Changeset 4e16bd7 in subsurface


Ignore:
Timestamp:
May 31, 2017, 10:16:29 AM (6 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
2a71559
Parents:
286bac6
git-author:
Dirk Hohndel <dirk@…> (05/31/17 10:08:56)
git-committer:
Dirk Hohndel <dirk@…> (05/31/17 10:16:29)
Message:

Android build script: update for Qt 5.9

Signed-off-by: Dirk Hohndel <dirk@…>

Files:
2 edited

Legend:

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

    r01d610b r4e16bd7  
    33# run this in the top level folder you want to create Android binaries in
    44#
    5 # it seems that with Qt5.7.1 or Qt5.8 and current cmake there is an odd bug where
     5# it seems that with Qt5.7 (and later) and current cmake there is an odd bug where
    66# cmake fails reporting :No known features for CXX compiler "GNU". In that
    77# case simly comment out the "set(property(TARGET Qt5::Core PROPERTY...)"
     
    1010# or at line 95 of
    1111# Qt/5.8/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
     12# or at line 105 of
     13# Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
     14# (this script tries to do this automatically)
    1215
    1316exec 1> >(tee ./build.log) 2>&1
     
    1720# these are the current versions for Qt, Android SDK & NDK:
    1821
    19 QT_VERSION=5.8
    20 LATEST_QT=5.8.0
     22QT_VERSION=5.9
     23LATEST_QT=5.9.0
    2124NDK_VERSION=r13b
    2225SDK_VERSION=r25.2.3
     
    3235
    3336if [ "$PLATFORM" = Linux ] ; then
    34         QT_BINARIES=qt-opensource-linux-x64-android-${LATEST_QT}.run
     37        QT_BINARIES=qt-opensource-linux-x64-${LATEST_QT}.run
    3538        NDK_BINARIES=${ANDROID_NDK}-linux-x86_64.zip
    3639        SDK_TOOLS=tools_${SDK_VERSION}-linux.zip
     
    6568        fi
    6669        chmod +x ./${QT_BINARIES}
    67         ./${QT_BINARIES} -platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
     70        ./${QT_BINARIES} --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations
    6871fi
    6972
  • qt-installer-noninteractive.qs

    r3ae9408 r4e16bd7  
    3333
    3434    widget.selectAll();
    35     widget.deselectComponent('qt.58.src');
     35    widget.deselectComponent('qt.59.src');
    3636
    3737    gui.clickButton(buttons.NextButton);
Note: See TracChangeset for help on using the changeset viewer.