diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:50:33 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:26 (GMT) |
| commit | a69160c5f4ef146f5e9922161bcff9c6fed213c7 (patch) | |
| tree | ab945650de3d1812166530eefddbc2432aed4939 /examples/activeqt/dotnet/wrapper/lib/tools.cpp | |
| parent | d2f4a4b4f232b1c42cd89ac0b6bccb77dfe8e0db (diff) | |
| download | Qt-a69160c5f4ef146f5e9922161bcff9c6fed213c7.zip Qt-a69160c5f4ef146f5e9922161bcff9c6fed213c7.tar.gz Qt-a69160c5f4ef146f5e9922161bcff9c6fed213c7.tar.bz2 | |
examples: QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'examples/activeqt/dotnet/wrapper/lib/tools.cpp')
| -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] |