Make Qt::TouchPointState ORable, add Q*TouchEvent::touchPointStates()

This new function returns a bitwise OR of all the touch point states for
the event. This makes it easy to see if a certain type of state is present
or not without the need to loop over all touch points.

QApplication and QGraphicsScene need to build this state when dispatching
the touch points. This also fixes the ASSERT bug that Denis found when
trying to send multiple touch presses in a touch begin event.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index 8b24d33..9fcda2f 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.h
+++ b/src/gui/graphicsview/qgraphicssceneevent.h
@@ -372,12 +372,15 @@ public:
     QGraphicsSceneTouchEvent(Type type = None);
     ~QGraphicsSceneTouchEvent();
 
-    const QList<QGraphicsSceneTouchEvent::TouchPoint *> &touchPoints() const;
-    void setTouchPoints(const QList<QGraphicsSceneTouchEvent::TouchPoint *> &touchPoints);
-
     Qt::KeyboardModifiers modifiers() const;
     void setModifiers(Qt::KeyboardModifiers modifiers);
 
+    Qt::TouchPointStates touchPointStates() const;
+    void setTouchPointStates(Qt::TouchPointStates touchPointStates);
+
+    const QList<QGraphicsSceneTouchEvent::TouchPoint *> &touchPoints() const;
+    void setTouchPoints(const QList<QGraphicsSceneTouchEvent::TouchPoint *> &touchPoints);
+
 private:
     Q_DECLARE_PRIVATE(QGraphicsSceneTouchEvent);
 };