diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 10:11:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 10:11:46 (GMT) |
| commit | b6e8943592ec6b2cbc619c35ca90feded0e1e87b (patch) | |
| tree | bb971d036401ac7eeb1cda928ae764408b48f141 /doc/src/snippets/declarative/codingconventions/javascript.qml | |
| parent | 554eedb76ecceca5123992147ed1aa48aabc6662 (diff) | |
| parent | 82575a9f6123eed3e8581b6e73833924fe47cace (diff) | |
| download | Qt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.zip Qt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.tar.gz Qt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.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:
Fixed regression in QPixmap::size() for null pixmaps.
Make test less sensitive to platform specifics
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 'doc/src/snippets/declarative/codingconventions/javascript.qml')
| -rw-r--r-- | doc/src/snippets/declarative/codingconventions/javascript.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml index fd19b02..90790b9 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript.qml +++ b/doc/src/snippets/declarative/codingconventions/javascript.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 documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: |