diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-31 15:34:14 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-31 15:37:30 +0000 |
| commit | 4570d5ce40625015005a5904561ef8122f9adad9 (patch) | |
| tree | 3b99936830db3f468fefa75b57116e7ab436aa74 | |
| parent | 92c97cda0496e0770488dc069c665248159f7230 (diff) | |
| download | qtlocation-4570d5ce40625015005a5904561ef8122f9adad9.tar.gz | |
Momentarily disable/remove Mapbox GL 3rdparty
We are moving it to a new directory, but seems like the CI bots
are not happy with moving a submodule, so we will remove and then
add again in a new location.
Change-Id: I66a251fd567ebdb8864d3afaaef1a9a663c7b106
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | src/plugins/geoservices/3rdparty/3rdparty.pro | 17 | ||||
| m--------- | src/plugins/geoservices/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 17 |
4 files changed, 0 insertions, 37 deletions
diff --git a/.gitmodules b/.gitmodules index 046a02c9..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "src/plugins/geoservices/3rdparty/mapbox-gl-native"] - path = src/plugins/geoservices/3rdparty/mapbox-gl-native - url = https://codereview.qt-project.org/p/qt/qtlocation-mapboxgl.git diff --git a/src/plugins/geoservices/3rdparty/3rdparty.pro b/src/plugins/geoservices/3rdparty/3rdparty.pro deleted file mode 100644 index 1d871025..00000000 --- a/src/plugins/geoservices/3rdparty/3rdparty.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = - -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/plugins/geoservices/3rdparty/mapbox-gl-native b/src/plugins/geoservices/3rdparty/mapbox-gl-native deleted file mode 160000 -Subproject 14809e0c56b8199a96e27214a7c8d5776e6e430 diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index 32dfee96..7a392b57 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -1,20 +1,3 @@ TEMPLATE = subdirs SUBDIRS = nokia osm mapbox esri - -linux|android: { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapboxgl 3rdparty - mapboxgl.depends += 3rdparty - } - - greaterThan(QT_GCC_MAJOR_VERSION, 4) { - SUBDIRS += mapboxgl 3rdparty - mapboxgl.depends += 3rdparty - } -} - -ios|macos: { - SUBDIRS += mapboxgl 3rdparty - mapboxgl.depends += 3rdparty -} |