diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-02 13:24:58 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-02 13:24:58 (GMT) |
| commit | b06d091815af689ba069667beabfc913589a258d (patch) | |
| tree | e4a77aa581bc037fd598faa2a75ac6d03175caa1 /doc/src | |
| parent | 91d96edc19805c9dcc35650eb42e7587837cecc8 (diff) | |
| parent | 1ffaf40f5cffca57d7e116d61935ccd034239222 (diff) | |
| download | Qt-b06d091815af689ba069667beabfc913589a258d.zip Qt-b06d091815af689ba069667beabfc913589a258d.tar.gz Qt-b06d091815af689ba069667beabfc913589a258d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/diagrams/programs/standard_views.py | 40 | ||||
| -rw-r--r-- | doc/src/frameworks-technologies/gestures.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qt-resources.qdoc | 1 |
3 files changed, 41 insertions, 2 deletions
diff --git a/doc/src/diagrams/programs/standard_views.py b/doc/src/diagrams/programs/standard_views.py index f1d69f6..5581387 100644 --- a/doc/src/diagrams/programs/standard_views.py +++ b/doc/src/diagrams/programs/standard_views.py @@ -1,4 +1,44 @@ #!/usr/bin/env python +############################################################################# +## +## 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 test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## 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. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# import sys from PyQt4.QtCore import QDir, Qt diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc index 1e3cc47..158a273 100644 --- a/doc/src/frameworks-technologies/gestures.qdoc +++ b/doc/src/frameworks-technologies/gestures.qdoc @@ -102,8 +102,6 @@ \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot start - \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot finish - Here, we examine the direction in which the user swiped the widget and modify its contents accordingly. diff --git a/doc/src/qt-resources.qdoc b/doc/src/qt-resources.qdoc index a7dffe4..3b31660 100644 --- a/doc/src/qt-resources.qdoc +++ b/doc/src/qt-resources.qdoc @@ -41,5 +41,6 @@ /*! \page qt-resources.html + \title Not Used \image gradient.png */ |