diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-05 12:51:22 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-12 06:24:02 +0000 |
commit | 0fc03a9d5bb72e9425a3033f9cdba5e28c73e338 (patch) | |
tree | e1d2092d0b6959da06fe4ca6821c045a477f484f /recipes-qt/qt5/qtlocation_git.bb | |
parent | 70f30e724d6057b99b8a9749b1cf8d9155fbab5f (diff) | |
download | meta-qt5-0fc03a9d5bb72e9425a3033f9cdba5e28c73e338.tar.gz |
qt5: update to Qt 5.11.1
Change-Id: I1e2c9bf48b2cb55c97a86446b4143be536a03899
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 1a79093e..7ad12b03 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -25,13 +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" | 28 | QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" |
29 | 29 | ||
30 | SRC_URI += " \ | 30 | SRC_URI += " \ |
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 \ | 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 \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "139414573ab27bd1df1b491aeb6003a6fc0d3d5d" | 34 | SRCREV_qtlocation = "8a7c9fa1a705f7a2fb3f066b755faaa2f4064ceb" |
35 | SRCREV_qtlocation-mapboxgl = "74df5203628b47931b4edcb5e8fe352f40fe7df4" | 35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |