diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 13:48:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 13:48:39 (GMT) |
| commit | 02c83c2adf0513041d9a3866d4e589ad79d61bda (patch) | |
| tree | c4f55089c85b6cc10cd39c734b34a7b78b544cd6 /doc | |
| parent | 2fdac06f820f2362d3ca83ab6d73ed874d903098 (diff) | |
| parent | b5af8fbbdc26fa50f40dad2c159b6b64827fa431 (diff) | |
| download | Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.zip Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.tar.gz Qt-02c83c2adf0513041d9a3866d4e589ad79d61bda.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:
Avoid printing a warning
Only steal hover events when enabled, in QtDemo's qml integration
Allow things that load SameGame to disable the Quit button
Seems to fix the keyboard focus confusion
Fix test
ListView doc improvements and examples clean up
Doc fixes
Fix event forwarding in QDeclarativeFlickable.
doc: improve Repeater model docs.
doc: couple more performance tips.
BorderImage is not updated when border values change
XmlListModel: Don't lock while doing the slow bit.
Auto test for QTBUG-11507
Properly update childrenRect for position changes and shrinking.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/pics/ListViewSections.png | bin | 7596 -> 5491 bytes | |||
| -rw-r--r-- | doc/src/declarative/qdeclarativeperformance.qdoc | 12 | ||||
| -rw-r--r-- | doc/src/examples/qml-examples.qdoc | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/doc/src/declarative/pics/ListViewSections.png b/doc/src/declarative/pics/ListViewSections.png Binary files differindex 9270126..4e8f076 100644 --- a/doc/src/declarative/pics/ListViewSections.png +++ b/doc/src/declarative/pics/ListViewSections.png diff --git a/doc/src/declarative/qdeclarativeperformance.qdoc b/doc/src/declarative/qdeclarativeperformance.qdoc index b535e4b..c866724 100644 --- a/doc/src/declarative/qdeclarativeperformance.qdoc +++ b/doc/src/declarative/qdeclarativeperformance.qdoc @@ -117,4 +117,16 @@ a Loader as needed. \o Fast data access - ensure the data model is as fast as possible. \endlist +\section1 Image resources over composition + +If possible, provide a single image resource, rather than using composition +of a number of elements. For example, a frame with a shadow could be created using +a Rectangle placed over an Image providing the shadow. It is more efficient to +provide an image that includes the frame and the shadow. + +\section1 Limit JavaScript + +Avoid running JavaScript during animation. For example, running a complex +JavaScript expression for each frame of an x property animation. + */ diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index b6069f2..ee708a8 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -213,7 +213,7 @@ \title Models and Views: ListView \example declarative/modelviews/listview - This example shows how to use the ListView element. + These examples show how to use the ListView element. */ /*! |
