From 181b3635f17101672c05af3e0800d7841fd259e8 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Tue, 20 Dec 2016 15:06:56 -0200
Subject: [core][Qt] Use Qt for UTF16, since `codecvt` is not always available

---
 platform/qt/qt.cmake    |  1 +
 platform/qt/src/utf.cpp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 platform/qt/src/utf.cpp

(limited to 'platform/qt')

diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 3382a9ac6b..bd7c863f98 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -48,6 +48,7 @@ set(MBGL_QT_FILES
     PRIVATE platform/qt/src/string_stdlib.cpp
     PRIVATE platform/qt/src/timer.cpp
     PRIVATE platform/qt/src/timer_impl.hpp
+    PRIVATE platform/qt/src/utf.cpp
 )
 
 include_directories(
diff --git a/platform/qt/src/utf.cpp b/platform/qt/src/utf.cpp
new file mode 100644
index 0000000000..d8bf2ca0b3
--- /dev/null
+++ b/platform/qt/src/utf.cpp
@@ -0,0 +1,17 @@
+#include <mbgl/util/utf.hpp>
+
+#include <QString>
+
+namespace mbgl {
+namespace util {
+
+std::u16string utf8_to_utf16::convert(std::string const& utf8) {
+    auto utf16 = QString::fromUtf8(utf8.data(), utf8.length());
+
+    // Newers Qt have QString::toStdU16String(), but this is how it is
+    // implemented. Do it here to keep compatibility with older versions.
+    return std::u16string(reinterpret_cast<const char16_t*>(utf16.utf16()), utf16.length());
+}
+
+} // namespace util
+} // namespace mbgl
-- 
cgit v1.2.1