diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-06-27 15:01:54 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-07-03 10:03:05 -0700 |
| commit | 35256c6e5bb1c217fde45c3e89b0db259d9c9f9b (patch) | |
| tree | 29c94cbd8052c3691bff958d0d175ded7ea5a17d /platform/qt | |
| parent | 9ff5d34ef2ed2a236cc495f0ad84919cedce9abc (diff) | |
| download | qtlocation-mapboxgl-35256c6e5bb1c217fde45c3e89b0db259d9c9f9b.tar.gz | |
[core] Default "collator" implementation
- Based on nunicode
- Not locale-aware
- Used by linux and Qt builds
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index fdbc463601..757c0ac44a 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -51,8 +51,6 @@ macro(mbgl_platform_core) target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp) endif() - target_sources(mbgl-core PRIVATE platform/default/local_glyph_rasterizer.cpp) - if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") target_add_mason_package(mbgl-core PRIVATE optional) target_add_mason_package(mbgl-core PRIVATE tao_tuple) diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index dda15174fb..fafbb895dc 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -38,6 +38,11 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/qt/src/timer.cpp PRIVATE platform/qt/src/timer_impl.hpp PRIVATE platform/qt/src/utf.cpp + + PRIVATE platform/default/local_glyph_rasterizer.cpp + PRIVATE platform/default/collator.cpp + PRIVATE platform/default/unaccent.cpp + PRIVATE platform/default/unaccent.hpp ) set(MBGL_QT_FILESOURCE_FILES |