diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-23 15:42:06 +0300 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-26 10:55:47 +0300 |
| commit | 9c8295c6a64b6f5b2c9b67fd01633a156481a3c8 (patch) | |
| tree | 27cbdbff1757d0e4aa88c3616f17233a143270e2 /next/platform | |
| parent | 30ffbe9b8d49d8d8a2820f7b452ebc1d1531f298 (diff) | |
| download | qtlocation-mapboxgl-9c8295c6a64b6f5b2c9b67fd01633a156481a3c8.tar.gz | |
[core][android][darwin] Move platform specific Collator impls from expression
Platform specific Collator implementations should not be part of an expression APIs.
Diffstat (limited to 'next/platform')
| -rw-r--r-- | next/platform/android/android.cmake | 4 | ||||
| -rw-r--r-- | next/platform/linux/linux.cmake | 2 | ||||
| -rw-r--r-- | next/platform/qt/qt.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 240d4ccfdf..edc74576dc 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -187,8 +187,8 @@ target_sources( ${MBGL_ROOT}/platform/android/src/style/transition_options.hpp ${MBGL_ROOT}/platform/android/src/style/value.cpp ${MBGL_ROOT}/platform/android/src/style/value.hpp - ${MBGL_ROOT}/platform/android/src/text/collator.cpp - ${MBGL_ROOT}/platform/android/src/text/collator_jni.hpp + ${MBGL_ROOT}/platform/android/src/i18n/collator.cpp + ${MBGL_ROOT}/platform/android/src/i18n/collator_jni.hpp ${MBGL_ROOT}/platform/android/src/text/format_number.cpp ${MBGL_ROOT}/platform/android/src/text/format_number_jni.hpp ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer.cpp diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 457ff441b8..993d3512e3 100644 --- a/next/platform/linux/linux.cmake +++ b/next/platform/linux/linux.cmake @@ -29,7 +29,7 @@ target_sources( ${MBGL_ROOT}/platform/default/src/mbgl/storage/online_file_source.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp ${MBGL_ROOT}/platform/default/src/mbgl/text/bidi.cpp - ${MBGL_ROOT}/platform/default/src/mbgl/text/collator.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/i18n/collator.cpp ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/async_task.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp diff --git a/next/platform/qt/qt.cmake b/next/platform/qt/qt.cmake index 4d9275aaae..59aa00788f 100644 --- a/next/platform/qt/qt.cmake +++ b/next/platform/qt/qt.cmake @@ -29,6 +29,7 @@ target_sources( ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_backend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_frontend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gl/headless_backend.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/i18n/collator.cpp ${MBGL_ROOT}/platform/default/src/mbgl/layermanager/layer_manager.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/asset_file_source.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/default_file_source.cpp @@ -41,7 +42,6 @@ target_sources( ${MBGL_ROOT}/platform/default/src/mbgl/storage/offline_download.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/online_file_source.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp - ${MBGL_ROOT}/platform/default/src/mbgl/text/collator.cpp ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp ${MBGL_ROOT}/platform/qt/src/async_task.cpp ${MBGL_ROOT}/platform/qt/src/async_task_impl.hpp |