diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 22:08:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 22:08:44 (GMT) |
| commit | 43f13b2deed1dc3797dec58b46957714ff635f66 (patch) | |
| tree | cb588ed2ac1c9c00ae5129adc6f996f628514b9d /examples/declarative/text/fonts/fonts.qml | |
| parent | ab31c1a482630007eccd532b49e03f0345421aa8 (diff) | |
| parent | f23bce37a8a3536bfedce7cc2d57f0761b2d1e31 (diff) | |
| download | Qt-43f13b2deed1dc3797dec58b46957714ff635f66.zip Qt-43f13b2deed1dc3797dec58b46957714ff635f66.tar.gz Qt-43f13b2deed1dc3797dec58b46957714ff635f66.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Further QML improvements.
Doc: Minor improvements to QML-related documentation.
The test livelock of QTimer is now expected to work
Make sure mapSelectionFromSource does not return a selection with invalid ranges.
QEventDispatcherUnix: do not process too many timer if other events need to be processed first
Doc: Continued work on the QML documentation.
Doc: More work on the QML documentation.
Doc: More work on the declarative API documentation.
Doc: Some editing and tidying up.
Doc: Added a missing file.
Doc: Fixed text in license headers.
Diffstat (limited to 'examples/declarative/text/fonts/fonts.qml')
| -rw-r--r-- | examples/declarative/text/fonts/fonts.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/declarative/text/fonts/fonts.qml index 8ed39a9..743ee79 100644 --- a/examples/declarative/text/fonts/fonts.qml +++ b/examples/declarative/text/fonts/fonts.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: |