blob: 49fcff6be5e7de52564d0c2f3514a808850b98b1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 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
mapbox-gl-native won't compile for ARMv5 or older, so disable the
build by default.
Task-number: QTBUG-61289
Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
---
src/plugins/geoservices/geoservices.pro | 2 +-
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
--- 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 {
!exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
} else {
|
