diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-01-20 04:01:26 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-01-20 04:01:26 (GMT) |
| commit | 63fe6b6d3ff66067b8309c6111c49c6a41620e55 (patch) | |
| tree | fe296fea28c0604eb07a2bc81248973c656a08b6 /doc/src | |
| parent | 3700ecf4236233fe73afbde671cfdc8e194a0125 (diff) | |
| parent | f95956a6cc61d0c05d96e2f8027167f51ed7dbea (diff) | |
| download | Qt-63fe6b6d3ff66067b8309c6111c49c6a41620e55.zip Qt-63fe6b6d3ff66067b8309c6111c49c6a41620e55.tar.gz Qt-63fe6b6d3ff66067b8309c6111c49c6a41620e55.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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] } |