diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 11:06:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-08 16:44:53 +0200 |
| commit | 1d988d971bc4270ba3d148e8e2c143bf8f625b6e (patch) | |
| tree | dc1d15e07d64df476ff0ac56c273b27007e3f805 /src/core/type_conversion.h | |
| parent | 94daa599a65e2113d0adaa9afddf8691a02c18bb (diff) | |
Adaptations for 90-based
Pick-to: 6.2
Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/type_conversion.h')
| -rw-r--r-- | src/core/type_conversion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index fff130218..9bf0416a9 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -118,7 +118,7 @@ inline base::string16 toString16(const QString &qString) #if defined(OS_WIN) return base::string16(qString.toStdWString()); #else - return base::string16(qString.utf16()); + return base::string16((const char16_t *)qString.utf16()); #endif } |