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 | 251f5e605f1f1bb3e56115f8cef66cacabfd9d83 (patch) | |
| tree | 55c81152898be05016ed8a55e975e0998719191d /platform/qt | |
| parent | 71a72d269a3f0de6f3cdb7780d2bf44f6a4e2c21 (diff) | |
| download | qtlocation-mapboxgl-251f5e605f1f1bb3e56115f8cef66cacabfd9d83.tar.gz | |
[core, vendor] Create vendored nunicode 1.8.
- Version bump to 1.8 necessary for "unaccent" functionality
- Qt now depends on nunicode, ruling out use of precompiled binaries
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 5f04367b25..fdbc463601 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -2,6 +2,7 @@ mason_use(optional VERSION f27e7908 HEADER_ONLY) mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY) include(platform/qt/qt.cmake) +include(cmake/nunicode.cmake) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) @@ -26,6 +27,7 @@ macro(mbgl_platform_core) target_link_libraries(mbgl-core ${MBGL_QT_CORE_LIBRARIES} + PRIVATE nunicode ) if(NOT WITH_QT_DECODERS) |