diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 05:01:12 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 05:01:12 (GMT) |
| commit | 8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190 (patch) | |
| tree | e0243494d098a4a8f39f140d4d3e7b9370a765c5 /doc/src/snippets/sqldatabase | |
| parent | a88e4867b35c73af6e5b410e926b6df9dc2e19a5 (diff) | |
| parent | 62d1b1db21d2660bd5f2322cb9f09cf2598bf90b (diff) | |
| download | Qt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.zip Qt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.tar.gz Qt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/sqldatabase')
| -rw-r--r-- | doc/src/snippets/sqldatabase/sqldatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/src/snippets/sqldatabase/sqldatabase.cpp index 55fd57f..b3d7e7a 100644 --- a/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the documentation of the Qt Toolkit. @@ -20,10 +21,9 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this -** package. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. |