diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:16:16 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:16:16 (GMT) |
| commit | 8987d9c2946d2cc565cec562393ee3627582699f (patch) | |
| tree | 70a5333fefed51724f00918293540ce076c95924 /src/declarative/extra | |
| parent | dc602e3b9c4d5e4da1d57ed657d82e73401b4531 (diff) | |
| parent | 56195216c52b28dc05eb6b2944f0fac01a222fdf (diff) | |
| download | Qt-8987d9c2946d2cc565cec562393ee3627582699f.zip Qt-8987d9c2946d2cc565cec562393ee3627582699f.tar.gz Qt-8987d9c2946d2cc565cec562393ee3627582699f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/extra')
| -rw-r--r-- | src/declarative/extra/qfxflowview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp index 0cfb7a9..a0fde47 100644 --- a/src/declarative/extra/qfxflowview.cpp +++ b/src/declarative/extra/qfxflowview.cpp @@ -134,7 +134,7 @@ void QFxFlowView::refresh() for (int ii = 0; ii < m_model->count(); ++ii) { if (QFxItem *item = m_model->item(ii)) { item->setParent(this); - item->setZ(0); + item->setZValue(0); m_items << item; } } @@ -298,7 +298,7 @@ void QFxFlowView::mousePressEvent(QGraphicsSceneMouseEvent *event) if (r.contains(event->pos())) { m_dragItem = item; - m_dragItem->setZ(1); + m_dragItem->setZValue(1); m_dragOffset = r.topLeft() - event->pos(); event->accept(); return; @@ -318,7 +318,7 @@ void QFxFlowView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event); if (m_dragItem) { - m_dragItem->setZ(0); + m_dragItem->setZValue(0); clearTimeLine(); |