diff options
| author | Molly Lloyd <molly@mapbox.com> | 2018-08-22 10:57:02 -0700 |
|---|---|---|
| committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
| commit | 2cdbe934c2df8e4efbadbda5d20eac0d59d24b05 (patch) | |
| tree | 4e8c568dd43e92deee97066a14e776702320768d /platform | |
| parent | 4a5dc37245d23805d13865f5ef9c5f26e539a9ca (diff) | |
| download | qtlocation-mapboxgl-2cdbe934c2df8e4efbadbda5d20eac0d59d24b05.tar.gz | |
[windows, qt] fix windows compiler errors, remove tao + tuple polyfill
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/node/test/ignores.json | 1 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index fcc9d88c88..fe6ead7722 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -40,6 +40,7 @@ "render-tests/fill-extrusion-pattern/literal": "https://github.com/mapbox/mapbox-gl-js/issues/3327", "render-tests/fill-extrusion-pattern/missing": "https://github.com/mapbox/mapbox-gl-js/issues/3327", "render-tests/fill-extrusion-pattern/opacity": "https://github.com/mapbox/mapbox-gl-js/issues/3327", + "render-tests/fill-extrusion-pattern/feature-expression": "https://github.com/mapbox/mapbox-gl-js/issues/3327", "render-tests/fill-pattern/update-feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", "render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary", "render-tests/geojson/inline-polygon-symbol": "behavior needs reconciliation with gl-js", diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 785b3cd76a..5cb622f813 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -40,7 +40,6 @@ macro(mbgl_platform_core) if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") target_add_mason_package(mbgl-core PRIVATE optional) - target_add_mason_package(mbgl-core PRIVATE tao_tuple) endif() endmacro() @@ -56,7 +55,6 @@ macro(mbgl_filesource) if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") target_add_mason_package(mbgl-filesource PRIVATE optional) - target_add_mason_package(mbgl-filesource PRIVATE tao_tuple) endif() endmacro() diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 341c0db45b..323c616a64 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -160,7 +160,6 @@ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") ) target_add_mason_package(qmapboxgl PRIVATE optional) - target_add_mason_package(qmapboxgl PRIVATE tao_tuple) elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "QNX") list(APPEND MBGL_QT_CORE_FILES PRIVATE platform/qt/src/thread.cpp |