diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-27 14:40:15 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-07 06:30:57 +0000 |
commit | 2987d74f3b610d36ddd743f840c15e2ccb64aaa3 (patch) | |
tree | 8c13947093e06f7b291a77fcc395355d4d172505 /recipes-qt/qt5/qtlocation_git.bb | |
parent | 6a766fa08af094e09d72ad52de3075e285af933a (diff) | |
download | meta-qt5-2987d74f3b610d36ddd743f840c15e2ccb64aaa3.tar.gz |
qt5: update submodulesv5.11.0-rc
Update submodules to the 5.11.0 RC
Task-number: QTBUG-67590
Change-Id: I30cbecdf958c2df15ea8243f1c8038806e31a9d2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 89295912..b20b1d77 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -25,11 +25,13 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
25 | # http://errors.yoctoproject.org/Errors/Details/152640/ | 25 | # http://errors.yoctoproject.org/Errors/Details/152640/ |
26 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 26 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
27 | 27 | ||
28 | QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging-5.11.0" | ||
29 | |||
28 | SRC_URI += " \ | 30 | SRC_URI += " \ |
29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
30 | " | 32 | " |
31 | 33 | ||
32 | SRCREV_qtlocation = "ecb6fbd235a8f23f0844bb2b926b78566c1aaa76" | 34 | SRCREV_qtlocation = "139414573ab27bd1df1b491aeb6003a6fc0d3d5d" |
33 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" | 35 | SRCREV_qtlocation-mapboxgl = "74df5203628b47931b4edcb5e8fe352f40fe7df4" |
34 | 36 | ||
35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |