diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-31 16:18:19 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-31 16:41:51 +0000 |
| commit | ae02d4c70a95dc40aeb4be41950930847c640cef (patch) | |
| tree | 9a594df990480f4739527c51efe5d8deb7e46ae6 /src/3rdparty/3rdparty.pro | |
| parent | 4570d5ce40625015005a5904561ef8122f9adad9 (diff) | |
| download | qtlocation-ae02d4c70a95dc40aeb4be41950930847c640cef.tar.gz | |
Re-enable the Mapbox GL 3rdparty and the plugin
It was previously disabled so we could move the 3rdparty package to
a more consistent location.
Change-Id: I9ebd8c8fe131b2821aa3205e0deda87e9e9db19c
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/3rdparty/3rdparty.pro')
| -rw-r--r-- | src/3rdparty/3rdparty.pro | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro index 72996c7b..15f63a5f 100644 --- a/src/3rdparty/3rdparty.pro +++ b/src/3rdparty/3rdparty.pro @@ -2,3 +2,17 @@ TEMPLATE = subdirs SUBDIRS += poly2tri SUBDIRS += clipper SUBDIRS += clip2tri + +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 + } +} + +ios|macos: { + SUBDIRS += mapbox-gl-native +} |