diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-03-30 16:13:00 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-03-30 16:13:00 (GMT) |
| commit | c5a1d34d16582c9d3d795086d36ca79655d1e3ce (patch) | |
| tree | 96fd1d68f82233d5411ff007dc058db7bb0d8385 /src/corelib/tools/qstring.cpp | |
| parent | 577853b93dd4cf848abbd95abfed7e5a9d48688b (diff) | |
| parent | e475c68f22732553caad350608f2539db7694979 (diff) | |
| download | Qt-c5a1d34d16582c9d3d795086d36ca79655d1e3ce.zip Qt-c5a1d34d16582c9d3d795086d36ca79655d1e3ce.tar.gz Qt-c5a1d34d16582c9d3d795086d36ca79655d1e3ce.tar.bz2 | |
Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 1b29adc..9c637ac 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -4864,7 +4864,8 @@ QString QString::toUpper() const a pointer to a zero-terminated array of unicode characters of type ushort (as returned by QString::utf16()). - \note This function expects a UTF-8 string for %s. + \note This function expects a UTF-8 string for %s and Latin-1 for + the format string. The format string supports most of the conversion specifiers provided by printf() in the standard C++ library. It doesn't |