summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2009-05-12 11:52:28 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2009-05-12 11:52:45 (GMT)
commitbc184432c49eb56254bc5db07c6af03718c6b0e7 (patch)
tree7aa2c3b4bf675153ebb73c80c80631d34717d0aa /src
parentbb0e2a55192cd134eb642dfa2f5e7ee93668a059 (diff)
downloadQt-bc184432c49eb56254bc5db07c6af03718c6b0e7.zip
Qt-bc184432c49eb56254bc5db07c6af03718c6b0e7.tar.gz
Qt-bc184432c49eb56254bc5db07c6af03718c6b0e7.tar.bz2
Correcting bug in QString::fromWCharArray documentation
Clearifying details about bit size of the wchar_t input and the way they are handled. Task-number:227709 Rev-by: Marius Storm-Olsen
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qstring.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 375d672..c3649e3 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -743,7 +743,9 @@ int QString::grow(int size)
/*!
\since 4.2
- Returns a copy of the \a string string encoded in ucs4.
+ Returns a copy of the \a string, where the encoding of \a string depends on
+ the size of wchar. If wchar is 4 bytes, the \a string is interpreted as ucs-4,
+ if wchar is 2 bytes it is interpreted as ucs-2.
If \a size is -1 (default), the \a string has to be 0 terminated.