diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 23:17:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 23:17:08 (GMT) |
| commit | 6e1f1d76b5bef03e44a2ec48a1a9359145dfca74 (patch) | |
| tree | 2c77488c22262b9d74228bdd54a89c4269aa5af6 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
| parent | 82440843435b8bf02391fae1c9df6f081a945a65 (diff) | |
| parent | c6867a620259ee6c82a038995f424bef63d45aea (diff) | |
| download | Qt-6e1f1d76b5bef03e44a2ec48a1a9359145dfca74.zip Qt-6e1f1d76b5bef03e44a2ec48a1a9359145dfca74.tar.gz Qt-6e1f1d76b5bef03e44a2ec48a1a9359145dfca74.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 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 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 31f7707..7fee44e 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1029,7 +1029,7 @@ void QDeclarativeFlickable::cancelFlick() void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o) { - QDeclarativeItem *i = qobject_cast<QDeclarativeItem *>(o); + QGraphicsObject *i = qobject_cast<QGraphicsObject *>(o); if (i) i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem); else |