diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 07:28:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 07:28:56 (GMT) |
| commit | 87e9034caf90fb02ae2564947b9cbf464b3ca97c (patch) | |
| tree | 10310b5918a8096a726122fc12dcb33b5f0d303e /tests/auto/declarative/qdeclarativeflickable/data | |
| parent | 50eefbaad10c217eeff5ac0d4b3581176e88e492 (diff) | |
| parent | 59d2b0a0a1c836d3371c18a2a857d88c2d28621f (diff) | |
| download | Qt-87e9034caf90fb02ae2564947b9cbf464b3ca97c.zip Qt-87e9034caf90fb02ae2564947b9cbf464b3ca97c.tar.gz Qt-87e9034caf90fb02ae2564947b9cbf464b3ca97c.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:
Add missing file
Docs - clarify use of PropertyChanges for immediate property changes in
Update QtDeclarative def files
Update QtGui def files
Add missing auto test files.
Fix game could not be restarted
Handle QGraphicsWidgets in Flickable
More positioners with QGraphicsWidgets fixes.
Make positioners work with QGraphicsWidgets also
emit countChanged where appropriate in Repeater
Diffstat (limited to 'tests/auto/declarative/qdeclarativeflickable/data')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml new file mode 100644 index 0000000..8e95a94 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml @@ -0,0 +1,7 @@ +import Qt 4.7 + +Flickable { + width: 100; height: 100 + + QGraphicsWidget { objectName: "widget1"; width: 200; height: 300 } +} |