diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-01-10 14:09:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-10 17:14:15 +0100 |
| commit | 75299e536d31c29382cf8d242307ea7a2feab0b8 (patch) | |
| tree | 03d71a6ee9e4b2f4e02a1742f72328e1cbb19f51 /src | |
| parent | 9f3dd65c4d3b70d039f738323ca0112498fc2166 (diff) | |
Fix type conversion for Windows
MSVC uses WString instead of Utf16 so this needs different
conversion in type_conversion.h.
Change-Id: I987acb4ea5ad5a98c94fd992a9de05f602be825d
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/type_conversion.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 94e30d72b..659096b6e 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -55,7 +55,11 @@ inline QString toQt(const base::string16 &string) { +#if defined(OS_WIN) + return QString::fromStdWString(string.data()); +#else return QString::fromUtf16(string.data()); +#endif } inline QString toQt(const std::string &string) @@ -65,7 +69,11 @@ inline QString toQt(const std::string &string) inline base::string16 toString16(const QString &qString) { +#if defined(OS_WIN) + return base::string16(qString.toStdWString()); +#else return base::string16(qString.utf16()); +#endif } inline QUrl toQt(const GURL &url) @@ -119,10 +127,10 @@ inline QMatrix4x4 toQt(const SkMatrix44 &m) inline base::FilePath::StringType toFilePathString(const QString &str) { -#if defined(OS_POSIX) - return str.toStdString(); -#elif defined(OS_WIN) +#if defined(OS_WIN) return str.toStdWString(); +#else + return str.toStdString(); #endif } |