diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-03-04 09:26:51 -0800 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-06 22:08:54 +0000 |
| commit | 41ccb2bd887b7dcb130b1008a59e29a964484567 (patch) | |
| tree | 2367764ac76cf73597f7af3dcba5ee8a5c14ff3d | |
| parent | 2c4811a1c33412cc47e92df1df63b7d1131439b3 (diff) | |
| download | qtlocation-41ccb2bd887b7dcb130b1008a59e29a964484567.tar.gz | |
Remove dependency on QtWidgets
Mapbox GL Native was using QtOpenGL and that was pulling
in the dependency on QtWidgets. Now we use only QtGui.
Task-number: QTBUG-58821
Change-Id: Iae4c0d6de24988180fd8c837ff53ffc426831a30
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 4 | ||||
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject c2bb0b4911505c7a1a5a78c02d3785856f42ee9 +Subproject 271f0c29ba5e282d200ed0a24cf142c6f0ea99f diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index 09bf12df..2f28e138 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -3,10 +3,6 @@ TEMPLATE = subdirs SUBDIRS = nokia osm mapbox esri defineTest(supportsMapboxGL) { - !qtHaveModule(opengl) { - return(false) - } - linux|android { equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { return(true) diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index ab2ed47a..56c599df 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -5,7 +5,6 @@ QT += \ location-private \ positioning-private \ network \ - opengl \ sql HEADERS += \ |