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, 16 insertions, 1 deletions

diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 419107c..7a4c424 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3727,8 +3727,11 @@ void QGestureEvent::accept(const QString &type)
 */
 QTouchEvent::QTouchEvent(QEvent::Type type,
                          Qt::KeyboardModifiers modifiers,
+                         Qt::TouchPointStates touchPointStates,
                          const QList<QTouchEvent::TouchPoint *> &touchPoints)
-    : QInputEvent(type, modifiers), _touchPoints(touchPoints)
+    : QInputEvent(type, modifiers),
+      _touchPointStates(touchPointStates),
+      _touchPoints(touchPoints)
 { }
 
 /*!
@@ -3737,6 +3740,18 @@ QTouchEvent::QTouchEvent(QEvent::Type type,
 QTouchEvent::~QTouchEvent()
 { }
 
+/*! \fn Qt::TouchPointStates QTouchEvent::touchPointStates() const
+
+    Returns a bitwise OR of all the touch point states for this event.
+*/
+
+/*! \fn void QTouchEvent::setTouchPointStates(Qt::TouchPointStates touchPointStates)
+
+    \internal
+
+    Sets a bitwise OR of all the touch point states for this event.
+*/
+
 /*! \fn const QList<QTouchEvent::TouchPoint *> &QTouchEvent::TouchPoints() const
 
     Returns the list of touch points contained in the touch event.