From c3eb798dc7b4e82b86169533ae59648205d88d48 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Sun, 12 Feb 2017 11:25:16 +0100
Subject: 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>
---
 src/3rdparty/3rdparty.pro | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/3rdparty')

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
-}
-- 
cgit v1.2.1