diff options
-rw-r--r-- | src/3rdparty/3rdparty.pro | 18 | ||||
-rw-r--r-- | src/plugins/geoservices/geoservices.pro | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro index 15f63a5f..30d4c1be 100644 --- a/src/3rdparty/3rdparty.pro +++ b/src/3rdparty/3rdparty.pro @@ -3,16 +3,18 @@ SUBDIRS += poly2tri SUBDIRS += clipper SUBDIRS += clip2tri -linux|android: { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapbox-gl-native +qtConfig(opengl) { + linux|android: { + equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { + SUBDIRS += mapbox-gl-native + } + + greaterThan(QT_GCC_MAJOR_VERSION, 4) { + SUBDIRS += mapbox-gl-native + } } - greaterThan(QT_GCC_MAJOR_VERSION, 4) { + ios|macos: { SUBDIRS += mapbox-gl-native } } - -ios|macos: { - SUBDIRS += mapbox-gl-native -} 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 -} |