Merge of the maemo-gestures branch onto qt/4.5.0

This is a squashed merge of all of the changes in the maemo-gestures
branch on-top of the qt/4.5.0 branch.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index de39205..cea0553 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -182,6 +182,9 @@ public:
     void storeMouseButtonsForMouseGrabber(QGraphicsSceneMouseEvent *event);
 
     QList<QGraphicsView *> views;
+    void addView(QGraphicsView *view);
+    void removeView(QGraphicsView *view);
+
     bool painterStateProtection;
 
     QMultiMap<QGraphicsItem *, QGraphicsItem *> sceneEventFilters;
@@ -264,6 +267,12 @@ public:
     void resolvePalette();
     void updatePalette(const QPalette &palette);
 
+    QSet<QGraphicsItem*> itemsWithGestures;
+    QSet<Qt::GestureType> grabbedGestures;
+    void grabGesture(QGraphicsItem *item, const Qt::GestureType &type);
+    void releaseGesture(QGraphicsItem *item, const Qt::GestureType &type);
+    void sendGestureEvent(QGraphicsItem *item, QGestureEvent *event);
+
     mutable QVector<QTransform> sceneTransformCache;
     mutable QBitArray validTransforms;
     mutable QVector<int> freeSceneTransformSlots;