diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-21 15:55:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-21 15:55:57 (GMT) |
| commit | 83f6232cadb5bfeeeec170bb17224c4032031dd7 (patch) | |
| tree | d9fc3ad22afe7025d5e12114a5ade35e27cefe97 /doc/src | |
| parent | 9dbba618af3b505c0aac590d0b0ec32eabb76d76 (diff) | |
| parent | dc6f3d03d88e8cf7b3b7940ef76ab8151f8588ce (diff) | |
| download | Qt-83f6232cadb5bfeeeec170bb17224c4032031dd7.zip Qt-83f6232cadb5bfeeeec170bb17224c4032031dd7.tar.gz Qt-83f6232cadb5bfeeeec170bb17224c4032031dd7.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:
Reduce amount of qmldir parsing
Fix local type lookup
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index ab75f8d..53de32c 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -143,6 +143,13 @@ since the \e first name-version match is used. Installed files do not need to import the module of which they are a part, as they can refer to the other QML files in the module as relative (local) files. +If the module is imported from a remote location, those files must nevertheless be listed in +the \c qmldir file. Internal files can be marked with the \c internal keyword, to ensure +they are not visible outside the module: + +\code +internal <TypeName> <File> +\endcode Installed and remote files \e must be referred to by version information described above, local files \e may have it. |