summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-05 15:00:28 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-05 15:00:28 (GMT)
commitdaa4d04090c75ac8e64552f6d14834b2b79d2abb (patch)
tree3f4bbf6e2c7f42b18af124d2d35e1867238ca736 /src/gui/graphicsview/qgraphicsitem.h
parent8c7180dd0ed9bd13724c75dc26f0fb18b0f48e7c (diff)
parent4cd683231190443e5243f66098c7322e3808a131 (diff)
downloadQt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.zip
Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.gz
Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.bz2
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 6e1c632..221513b 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -557,7 +557,8 @@ public:
using QObject::children;
#endif
- void grabGesture(Qt::GestureType type, Qt::GestureContext context = Qt::ItemWithChildrenGesture);
+ void grabGesture(Qt::GestureType type, Qt::GestureFlags flags = Qt::GestureFlags());
+ void ungrabGesture(Qt::GestureType type);
Q_SIGNALS:
void parentChanged();