diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 14:19:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 14:19:15 (GMT) |
| commit | f018d9236647b687e03dd9d2e1867944b4f4058b (patch) | |
| tree | fa45c1bba51250efd04d630eef9a1d8ca4ca5941 /src/declarative/graphicsitems/qdeclarativepositioners.cpp | |
| parent | bc331aca61a2f212a347708c9d44a4fb092183fd (diff) | |
| parent | f34259ed82da481f009830839ad4d421d9b80780 (diff) | |
| download | Qt-f018d9236647b687e03dd9d2e1867944b4f4058b.zip Qt-f018d9236647b687e03dd9d2e1867944b4f4058b.tar.gz Qt-f018d9236647b687e03dd9d2e1867944b4f4058b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepositioners.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 4560d32..27a1301 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -364,9 +364,13 @@ void QDeclarativeBasePositioner::finishApplyTransitions() \qml Column { spacing: 2 - add: ... - move: ... - ... + add: Transition { + // Define an animation for adding a new item... + } + move: Transition { + // Define an animation for moving items within the column... + } + // ... } \endqml |