diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 07:33:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 07:33:16 (GMT) |
| commit | e4c41d50955fead0efb03893571c7fcb89c8fe32 (patch) | |
| tree | 192316696acdd2ff3bfda21b46e2d071f3d85b73 /doc/src/declarative/modules.qdoc | |
| parent | 8cbc34de67d52d5923b3a70bf84aadfe3aa94f24 (diff) | |
| parent | f25391e52af3eef68abfa3941fc48da0c52bb010 (diff) | |
| download | Qt-e4c41d50955fead0efb03893571c7fcb89c8fe32.zip Qt-e4c41d50955fead0efb03893571c7fcb89c8fe32.tar.gz Qt-e4c41d50955fead0efb03893571c7fcb89c8fe32.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve test coverage for declarative module.
Avoid potential null dereference.
Add autotest for reserved words in QML.
Prevent crash in XmlListModel when appending an empty role.
Remove unused, unexported class.
Fix clipping behavior for non-cached text.
Compile
Only cache textlayout in paint engines that support transformations
QmlDebugService: Fix compiler warning about cast from ascii
Qt.openUrlExternally should resolve relative URLs.
Doc: add missing image.
Doc: typographical and spelling errors.
Doc: remove unfinished and confusing mention to focus panels.
Apply the QStaticText text-caching strategy for QML
Documentation: input to Qt.rgba should be from 0-1, not 0-255.
Diffstat (limited to 'doc/src/declarative/modules.qdoc')
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 044c1e7..25a61c9 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -233,7 +233,7 @@ internal <TypeName> <File> plugin <Name> [<Path>] \endcode -\bold {# <Commment>} lines are used for comments. They are ignored by the QML engine. +\bold {# <Comment>} lines are used for comments. They are ignored by the QML engine. \bold {<TypeName> [<InitialVersion>] <File>} lines are used to add QML files as types. <TypeName> is the type being made available, the optional <InitialVersion> is a version @@ -246,7 +246,7 @@ the \c qmldir file. Types which you do not wish to export to users of your modul may be marked with the \c internal keyword: \bold {internal <TypeName> <File>}. The same type can be provided by different files in different versions, in which -case later versions (eg. 1.2) must precede earlier versions (eg. 1.0), +case later versions (e.g. 1.2) must precede earlier versions (e.g. 1.0), since the \e first name-version match is used and a request for a version of a type can be fulfilled by one defined in an earlier version of the module. If a user attempts to import a version earlier than the earliest provided or later than the latest provided, |