diff options
Diffstat (limited to 'src/core/tools/main.cpp')
| -rw-r--r-- | src/core/tools/main.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/tools/main.cpp b/src/core/tools/main.cpp index 7d3515a82..a23de0f8b 100644 --- a/src/core/tools/main.cpp +++ b/src/core/tools/main.cpp @@ -48,13 +48,16 @@ inline base::FilePath toFilePath(const QString &str) return base::FilePath(toFilePathString(str)); } -inline QString toQt(const std::u16string &string) +#if defined(Q_OS_WIN) +inline QString toQt(const std::wstring &string) { -#if defined(OS_WIN) return QString::fromStdWString(string); -#else - return QString::fromUtf16(reinterpret_cast<const char16_t *>(string.data()), string.size()); +} #endif + +inline QString toQt(const std::u16string &string) +{ + return QString::fromStdU16String(string); } inline QString toQt(const std::string &string) |