diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
| commit | 91a2da396fb476401e3b2c55ca7672a8b462ceca (patch) | |
| tree | dc944bf7d6df0fc0e2b0bad290396084626dd898 /doc/src | |
| parent | 530fd3831f012337d7460c4387ce82083ab3e144 (diff) | |
| parent | 5f92bc9dd9f05f4824711b03406bdbe222ff73e9 (diff) | |
| download | Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.zip Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.gz Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qobject.cpp
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/modules.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/qstring/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 681fb5a..50ab9f8 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -1047,7 +1047,7 @@ distributed under the following license. \legalese - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br All rights reserved.\br Contact: Nokia Corporation (qt-info@nokia.com) 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] } |