diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-05 15:00:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-05 15:00:28 (GMT) |
| commit | daa4d04090c75ac8e64552f6d14834b2b79d2abb (patch) | |
| tree | 3f4bbf6e2c7f42b18af124d2d35e1867238ca736 /src/gui/graphicsview/qgraphicsscene_p.h | |
| parent | 8c7180dd0ed9bd13724c75dc26f0fb18b0f48e7c (diff) | |
| parent | 4cd683231190443e5243f66098c7322e3808a131 (diff) | |
| download | Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.zip Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.gz Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index 6d46db5..c675c56 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -295,6 +295,7 @@ public: QMap<Qt::GestureType, QGesture *> *conflictedGestures, QList<QList<QGraphicsObject *> > *conflictedItems, QHash<QGesture *, QGraphicsObject *> *normalGestures); + void cancelGesturesForChildren(QGesture *original, QWidget *viewport); void updateInputMethodSensitivityInViews(); |