diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 15:38:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 15:38:54 (GMT) |
| commit | 2c86259f7422531c234faac1d1abbde603228195 (patch) | |
| tree | 7f6efe2d32543d7875461b5e0ff40a05be854517 /doc | |
| parent | b997254ba37e3ccfaa26be7021e2b172bfd82691 (diff) | |
| parent | e318e3985247e0be91ae4f94afef7a39ea9928c6 (diff) | |
| download | Qt-2c86259f7422531c234faac1d1abbde603228195.zip Qt-2c86259f7422531c234faac1d1abbde603228195.tar.gz Qt-2c86259f7422531c234faac1d1abbde603228195.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make the qWarnings in the animation API more useful.
Fixed y-inverted pixmaps on N900.
Fix X11/EGL builds using OpenGL ES 1.1
Fix Typo
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/snippets/qstring/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp index 629586e..3be504c 100644 --- a/doc/src/snippets/qstring/main.cpp +++ b/doc/src/snippets/qstring/main.cpp @@ -802,7 +802,7 @@ void Widget::toLowerFunction() { //! [75] QString str = "Qt by NOKIA"; - str = str.toLower(); // str == "qy by nokia" + str = str.toLower(); // str == "qt by nokia" //! [75] } |