summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-02-03 11:17:55 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-02-03 11:36:23 (GMT)
commit787a20b76b7f6e0dd6c7a6331220b46b5eddff79 (patch)
tree4ee9c7f9259f54729fc0b371853bdca611cabeb2 /src
parent7c88696469b60ee39444c2cefa94ad5b16acf5e2 (diff)
downloadQt-787a20b76b7f6e0dd6c7a6331220b46b5eddff79.zip
Qt-787a20b76b7f6e0dd6c7a6331220b46b5eddff79.tar.gz
Qt-787a20b76b7f6e0dd6c7a6331220b46b5eddff79.tar.bz2
revert to fromUtf16() usage in fromWCharArray()
this is a public function, so changing its semantics is no option. in fact, it broke qmake on windows (for symbian-abld and wince50smart). Reviewed-by: joerg
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qstring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 3388500..3ef0e66 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -885,7 +885,7 @@ int QString::grow(int size)
QString QString::fromWCharArray(const wchar_t *string, int size)
{
if (sizeof(wchar_t) == sizeof(QChar)) {
- return QString((const QChar *)string, size);
+ return fromUtf16((const ushort *)string, size);
} else {
return fromUcs4((uint *)string, size);
}