diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 05:00:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 05:00:54 (GMT) |
| commit | efc8b0c9c97a84097bc7f62a109e455caa8b2279 (patch) | |
| tree | c2db4a844ba39a96125d4eba2f56b1c51a46badb /doc | |
| parent | dc5543f5595870209e8122d13d070694b5e0eb39 (diff) | |
| parent | a6b0458c5ab5bc8ad6c868425820e0bf0e932336 (diff) | |
| download | Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.zip Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.tar.gz Qt-efc8b0c9c97a84097bc7f62a109e455caa8b2279.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:
doc: add note that items with width or height of 0 are not positioned.
Add test for model data changes.
clearFocus() shouldn't mess with focus if it doesn't have focus
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. */ |