diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 16:21:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 16:21:24 (GMT) |
| commit | 7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (patch) | |
| tree | 3ed1219e02bab53df871e7bf87bcf191c1a7534b /doc | |
| parent | 65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (diff) | |
| parent | 6d178306f71564471cc08eb7dc98743c3752cac4 (diff) | |
| download | Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.zip Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.tar.gz Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.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:
Fix the N900 device orientation backend
Micro cleanup
Write TextInput.positionToRectangle docs.
Minor demo fixes
Fix autoScroll implementation
Move knowledge of QGraphicsObject out of qml engine
Stopping a flick resulted in the next click being consumed.
Enhance docs
Slight addition to the docs.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/extending.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/declarative/qtbinding.qdoc | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index 173fb6d..03c0ec4 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -425,6 +425,9 @@ value will not be accessible from script. \l {Extending QML - Signal Support Example} shows the complete code used to implement the onPartyStarted signal property. +If you want to use signals from items not created in QML, you can access their +signals with the \l {Connections} element. + \section1 Property Value Sources \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0 diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc index 7d696d7..784c59a 100644 --- a/doc/src/declarative/qtbinding.qdoc +++ b/doc/src/declarative/qtbinding.qdoc @@ -269,5 +269,10 @@ For example: \c [project/main.qml] \snippet doc/src/snippets/declarative/qtbinding/resources/main.qml 0 +Note that the resource system cannot be accessed from QML directly. If the main QML file is +loaded as a resource, all files specifed as relative paths in QML will also be loaded from +the resource system. Using the resource system is completely transparent to the QML layer. +This also means that if the main QML file is not loaded as a resource then files in the resource +system cannot be accessed from QML. */ |