diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-12 11:25:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-13 07:44:20 +0000 |
| commit | c3eb798dc7b4e82b86169533ae59648205d88d48 (patch) | |
| tree | 6841547681f1e0959d168bb1dbfc9fff02f7be2a /src/plugins/geoservices | |
| parent | c9266145e7d60e0981f24087050f552617ff2077 (diff) | |
| download | qtlocation-c3eb798dc7b4e82b86169533ae59648205d88d48.tar.gz | |
mapbox-gl-native and mapboxgl depend on opengl
Task-number: QTBUG-58807
Change-Id: I64f66024e83eaf6414a80085ef98d1ad041464dd
Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index a70822dd..487183b7 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -2,16 +2,18 @@ TEMPLATE = subdirs SUBDIRS = nokia osm mapbox esri -linux|android: { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapboxgl +qtConfig(opengl) { + linux|android: { + equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { + SUBDIRS += mapboxgl + } + + greaterThan(QT_GCC_MAJOR_VERSION, 4) { + SUBDIRS += mapboxgl + } } - greaterThan(QT_GCC_MAJOR_VERSION, 4) { + ios|macos: { SUBDIRS += mapboxgl } } - -ios|macos: { - SUBDIRS += mapboxgl -} |