summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-02-12 11:25:16 +0100
committerLiang Qi <liang.qi@qt.io>2017-02-13 07:44:20 +0000
commitc3eb798dc7b4e82b86169533ae59648205d88d48 (patch)
tree6841547681f1e0959d168bb1dbfc9fff02f7be2a /src/3rdparty
parentc9266145e7d60e0981f24087050f552617ff2077 (diff)
downloadqtlocation-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/3rdparty')
-rw-r--r--src/3rdparty/3rdparty.pro18
1 files changed, 10 insertions, 8 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
-}