diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-03-06 19:16:00 -0800 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-07 13:47:03 +0000 |
| commit | 0d6ee6d36ece55760fca445fd601252df4ec3a3e (patch) | |
| tree | f8563498b3530fc25ccaf3c69dcb6911dd9530f6 /src/plugins/geoservices/geoservices.pro | |
| parent | f4ccd865419b8d812857d96e87126f36d4eff9b7 (diff) | |
| download | qtlocation-0d6ee6d36ece55760fca445fd601252df4ec3a3e.tar.gz | |
Simplify the criterea for building the Mapbox GL plugin
What we should really be looking for is if we can do C++14.
Change-Id: I43ce71e02a397b970eb4e57b8c25aee99d4282e0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices/geoservices.pro')
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index 2f28e138..b76e36cc 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -2,25 +2,7 @@ TEMPLATE = subdirs SUBDIRS = nokia osm mapbox esri -defineTest(supportsMapboxGL) { - linux|android { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - return(true) - } - - greaterThan(QT_GCC_MAJOR_VERSION, 4) { - return(true) - } - } - - ios|macos { - return(true) - } - - return(false) -} - -supportsMapboxGL() { +qtConfig(c++14):!win32 { !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { |