Changeset 6451adf in subsurface


Ignore:
Timestamp:
Jun 30, 2017, 5:21:07 PM (3 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
7199ad3
Parents:
4604b6a
git-author:
Dirk Hohndel <dirk@…> (06/30/17 16:57:13)
git-committer:
Dirk Hohndel <dirk@…> (06/30/17 17:21:07)
Message:

Android build: switch to Qt 5.9.1

It seems that the Qt team deviated from their previous practice to keep
the Qt/x.y directory structure the same for all minor releases - so now
it is indeed Qt/5.9.1
Oh well.

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

Location:
packaging/android
Files:
2 edited

Legend:

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

    rf0c9032 r6451adf  
    2020# these are the current versions for Qt, Android SDK & NDK:
    2121
    22 QT_VERSION=5.9
    23 LATEST_QT=5.9.0
     22QT_VERSION=5.9.1
     23LATEST_QT=5.9.1
    2424NDK_VERSION=r14b
    2525SDK_VERSION=r25.2.3
  • packaging/android/build.sh

    r05435d6 r6451adf  
    7777if [ -n "${QT5_ANDROID+X}" ] ; then
    7878        echo "Using Qt5 in $QT5_ANDROID"
     79elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.1" ] ; then
     80        export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.1
    7981elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then
    8082        export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9
Note: See TracChangeset for help on using the changeset viewer.