diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 17:02:29 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 17:33:38 +0200 |
commit | 9c7507ef155d9c248b6d9b12349c52fa1410e482 (patch) | |
tree | af4e914fe7582afcdf38fcf9223ea4e429fd1513 /recipes-qt/qt5/qtlocation | |
parent | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (diff) |
qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtlocation')
-rw-r--r-- | recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch index 49fcff6b..7db1676d 100644 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -1,4 +1,4 @@ -From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 +From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 7 Jun 2017 13:29:29 +0300 Subject: [PATCH] Make mapbox-gl build configurable @@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 0810d39..03fc119 100644 +index 459897a8..d97e05d0 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -6,7 +6,7 @@ qtConfig(concurrent) { SUBDIRS += osm } --qtConfig(c++14):!win32|mingw:!qnx { -+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx { +-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { ++mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { |