diff options
Diffstat (limited to 'recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch')
| -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 @@ | |||
| 1 | From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 | 1 | From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Wed, 7 Jun 2017 13:29:29 +0300 | 3 | Date: Wed, 7 Jun 2017 13:29:29 +0300 |
| 4 | Subject: [PATCH] Make mapbox-gl build configurable | 4 | Subject: [PATCH] Make mapbox-gl build configurable |
| @@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b | |||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | 14 | ||
| 15 | diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro | 15 | diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro |
| 16 | index 0810d39..03fc119 100644 | 16 | index 459897a8..d97e05d0 100644 |
| 17 | --- a/src/plugins/geoservices/geoservices.pro | 17 | --- a/src/plugins/geoservices/geoservices.pro |
| 18 | +++ b/src/plugins/geoservices/geoservices.pro | 18 | +++ b/src/plugins/geoservices/geoservices.pro |
| 19 | @@ -6,7 +6,7 @@ qtConfig(concurrent) { | 19 | @@ -6,7 +6,7 @@ qtConfig(concurrent) { |
| 20 | SUBDIRS += osm | 20 | SUBDIRS += osm |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | -qtConfig(c++14):!win32|mingw:!qnx { | 23 | -qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { |
| 24 | +mapboxgl:qtConfig(c++14):!win32|mingw:!qnx { | 24 | +mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { |
| 25 | !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { | 25 | !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { |
| 26 | warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") | 26 | warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") |
| 27 | } else { | 27 | } else { |
