summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorMolly Lloyd <molly@mapbox.com>2018-08-22 10:57:02 -0700
committerMolly Lloyd <mollymerp@users.noreply.github.com>2018-08-31 13:08:47 -0700
commit2cdbe934c2df8e4efbadbda5d20eac0d59d24b05 (patch)
tree4e8c568dd43e92deee97066a14e776702320768d /platform/qt
parent4a5dc37245d23805d13865f5ef9c5f26e539a9ca (diff)
downloadqtlocation-mapboxgl-2cdbe934c2df8e4efbadbda5d20eac0d59d24b05.tar.gz
[windows, qt] fix windows compiler errors, remove tao + tuple polyfill
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/config.cmake2
-rw-r--r--platform/qt/qt.cmake1
2 files changed, 0 insertions, 3 deletions
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