diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-08 06:54:11 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-08 06:54:11 (GMT) |
commit | 4bd0dc0b6c07ff288c77f547792a62d5e8ad7356 (patch) | |
tree | e25a69328e70dd4bce1c70050948a258b07779bd /src | |
parent | 03a2ed58778d500cc7eed285478d0e304b3c92dc (diff) | |
download | Qt-4bd0dc0b6c07ff288c77f547792a62d5e8ad7356.zip Qt-4bd0dc0b6c07ff288c77f547792a62d5e8ad7356.tar.gz Qt-4bd0dc0b6c07ff288c77f547792a62d5e8ad7356.tar.bz2 |
fix QDeclarativeItem sceneEvent handling
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index b0a7570..59dd43d 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2217,7 +2217,7 @@ void QDeclarativeItem::setKeepMouseGrab(bool keep) \qmlmethod object Item::mapFromItem(Item item, int x, int y) Maps the point (\a x, \a y), which is in \a item's coordinate system, to - this item's coordinate system, and returns an object with \c x and \c y + this item's coordinate system, and returns an object with \c x and \c y properties matching the mapped cooordinate. If \a item is a \c null value, this maps the point from the coordinate @@ -2576,9 +2576,9 @@ bool QDeclarativeItem::sceneEvent(QEvent *event) !(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { keyPressEvent(static_cast<QKeyEvent *>(event)); if (!event->isAccepted()) - QGraphicsItem::sceneEvent(event); + return QGraphicsItem::sceneEvent(event); } else { - QGraphicsItem::sceneEvent(event); + return QGraphicsItem::sceneEvent(event); } } else { bool rv = QGraphicsItem::sceneEvent(event); |