diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 14:23:50 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 14:23:50 (GMT) |
| commit | bdc951eb87e0b1aa752d3ec750cfd837714bd8b7 (patch) | |
| tree | 65f9abe4c72b112118fac79cc6c46bcd379aebf2 /src/gui/graphicsview | |
| parent | 6b08c50f93236fec9ed24eaf36f839315e8dc08e (diff) | |
| parent | 2eee73e843ba7b4c6e83bd6bfaa08994520c417d (diff) | |
| download | Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.zip Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.tar.gz Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 81bbb5c..45627f6 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7287,10 +7287,16 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent QGraphicsItem::d_ptr->isObject = true; } -void QGraphicsObject::grabGesture(Qt::GestureType type, Qt::GestureContext context) +/*! + Subscribes the graphics object to the given \a gesture for the specified \a context. + + \sa QGestureEvent +*/ + +void QGraphicsObject::grabGesture(Qt::GestureType gesture, Qt::GestureContext context) { QGraphicsItemPrivate * const d = QGraphicsItem::d_func(); - d->gestureContext.insert(type, context); + d->gestureContext.insert(gesture, context); (void)QGestureManager::instance(); // create a gesture manager } |