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 | |
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')
-rw-r--r-- | src/3rdparty/3rdparty.pro | 14 | ||||
m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
-rw-r--r-- | src/plugins/geoservices/geoservices.pro | 14 | ||||
-rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 4 | ||||
-rw-r--r-- | src/src.pro | 2 |
5 files changed, 31 insertions, 3 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 +} diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native new file mode 160000 +Subproject 14809e0c56b8199a96e27214a7c8d5776e6e430 diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index 7a392b57..a70822dd 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -1,3 +1,17 @@ TEMPLATE = subdirs SUBDIRS = nokia osm mapbox esri + +linux|android: { + equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { + SUBDIRS += mapboxgl + } + + greaterThan(QT_GCC_MAJOR_VERSION, 4) { + SUBDIRS += mapboxgl + } +} + +ios|macos: { + SUBDIRS += mapboxgl +} diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index ac139940..630bd6a9 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -21,9 +21,9 @@ SOURCES += \ OTHER_FILES += \ mapboxgl_plugin.json -INCLUDEPATH += ../3rdparty/mapbox-gl-native/platform/qt/include +INCLUDEPATH += ../../../3rdparty/mapbox-gl-native/platform/qt/include -LIBS_PRIVATE += -L$$OUT_PWD/../3rdparty/mapbox-gl-native/ -lqmapboxgl +LIBS_PRIVATE += -L$$OUT_PWD/../../../3rdparty/mapbox-gl-native/ -lqmapboxgl PLUGIN_TYPE = geoservices PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapboxGL diff --git a/src/src.pro b/src/src.pro index 4b9c4985..a64ac534 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += positioning -plugins.depends += positioning +plugins.depends += positioning 3rdparty qtHaveModule(quick) { SUBDIRS += 3rdparty |