diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-01 10:09:48 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-01 10:09:48 (GMT) |
| commit | 6097501c9b324c08ae5b5c3dee3c64d385d3c5ac (patch) | |
| tree | b3ccf51aed15f9e9a94a502947d91128160123eb /examples | |
| parent | 3618227de7036a091ea8187a20434470c0c792dc (diff) | |
| parent | a6e32ae1c84984041107a83db9307caffbda9849 (diff) | |
| download | Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.zip Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.gz Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/dotnet/wrapper/lib/tools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.cpp b/examples/activeqt/dotnet/wrapper/lib/tools.cpp index 856b5c8..eac2d78 100644 --- a/examples/activeqt/dotnet/wrapper/lib/tools.cpp +++ b/examples/activeqt/dotnet/wrapper/lib/tools.cpp @@ -56,6 +56,6 @@ String *QStringToString(const QString &qstring) QString StringToQString(String *string) { const wchar_t __pin *chars = PtrToStringChars(string); - return QString::fromUtf16((const ushort *)chars); + return QString::fromWCharArray(chars); } //! [1] |