summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudarsana Babu Nagineni <sudarsana.babu@mapbox.com>2018-08-07 16:13:46 +0300
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-08-14 13:10:46 +0000
commita915ceeff0ab11c93621f39cc1f08bc418c5ec01 (patch)
tree04e477efae7c382ad8e5ba8f9f076583fe121a14
parent40e9867254d2241fdac1ea76d416ad54e71d04ac (diff)
downloadqtlocation-a915ceeff0ab11c93621f39cc1f08bc418c5ec01.tar.gz
Bump Mapbox GL to the latest version
Bumps Mapbox GL to a new version that fixes the compilation errors on QNX 7. Also, enable Mapbox GL Native plugin for QNX. mapbox-gl-native @ 27b21363e62c105db0b040b4c5a5ef31170ebd30 Task-number: QTBUG-59685 Change-Id: Icc70ab53ba6f76e319feb53858f3614f3edca3e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
m---------src/3rdparty/mapbox-gl-native0
-rw-r--r--src/location/configure.json2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native
-Subproject b59b0450c60b3df9e0852f62f6c8a6024889cd9
+Subproject 4b85252fbe811a786c6ee9eabedb7639b031dc5
diff --git a/src/location/configure.json b/src/location/configure.json
index bf15f0be..90565052 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -43,7 +43,7 @@
"condition": [
"features.opengl",
"features.c++14",
- "!config.qnx && !config.intel_icc && (!config.win32 || config.mingw)"
+ "!config.intel_icc && (!config.win32 || config.mingw)"
],
"output": [ "privateFeature" ]
},