2 files changed, 33 insertions, 11 deletions

diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp
index f90f6c6..9a5eb02 100644
--- a/tests/manual/gestures/scrollarea/main.cpp
+++ b/tests/manual/gestures/scrollarea/main.cpp
@@ -73,11 +73,11 @@ protected:
         QPanGesture *pan = static_cast<QPanGesture *>(event->gesture(Qt::PanGesture));
         if (pan) {
             switch(pan->state()) {
-            case Qt::GestureStarted: qDebug("area: Pan: started"); break;
-            case Qt::GestureFinished: qDebug("area: Pan: finished"); break;
-            case Qt::GestureCanceled: qDebug("area: Pan: canceled"); break;
+            case Qt::GestureStarted: qDebug() << this << "Pan: started"; break;
+            case Qt::GestureFinished: qDebug() << this << "Pan: finished"; break;
+            case Qt::GestureCanceled: qDebug() << this << "Pan: canceled"; break;
             case Qt::GestureUpdated: break;
-            default: qDebug("area: Pan: <unknown state>"); break;
+            default: qDebug() << this << "Pan: <unknown state>"; break;
             }
 
             if (pan->state() == Qt::GestureStarted)
@@ -134,11 +134,11 @@ protected:
         QPanGesture *pan = static_cast<QPanGesture *>(event->gesture(Qt::PanGesture));
         if (pan) {
             switch (pan->state()) {
-            case Qt::GestureStarted: qDebug("slider: Pan: started"); break;
-            case Qt::GestureFinished: qDebug("slider: Pan: finished"); break;
-            case Qt::GestureCanceled: qDebug("slider: Pan: canceled"); break;
+            case Qt::GestureStarted: qDebug() << this << "Pan: started"; break;
+            case Qt::GestureFinished: qDebug() << this << "Pan: finished"; break;
+            case Qt::GestureCanceled: qDebug() << this << "Pan: canceled"; break;
             case Qt::GestureUpdated: break;
-            default: qDebug("slider: Pan: <unknown state>"); break;
+            default: qDebug() << this << "Pan: <unknown state>"; break;
             }
 
             if (pan->state() == Qt::GestureStarted)
@@ -186,6 +186,7 @@ public:
     MainWindow()
     {
         rootScrollArea = new ScrollArea;
+        rootScrollArea->setObjectName(QLatin1String("rootScrollArea"));
         setCentralWidget(rootScrollArea);
 
         QWidget *root = new QWidget;
@@ -193,14 +194,17 @@ public:
         rootScrollArea->setWidget(root);
 
         Slider *verticalSlider = new Slider(Qt::Vertical, root);
+        verticalSlider->setObjectName(QLatin1String("verticalSlider"));
         verticalSlider ->move(650, 1100);
         Slider *horizontalSlider = new Slider(Qt::Horizontal, root);
+        horizontalSlider->setObjectName(QLatin1String("horizontalSlider"));
         horizontalSlider ->move(600, 1000);
 
         childScrollArea = new ScrollArea(root);
+        childScrollArea->setObjectName(QLatin1String("childScrollArea"));
         childScrollArea->move(500, 500);
         QWidget *w = new QWidget;
-        w->setMinimumWidth(400);
+        w->setMinimumWidth(700);
         QVBoxLayout *l = new QVBoxLayout(w);
         l->setMargin(20);
         for (int i = 0; i < 100; ++i) {
@@ -211,6 +215,14 @@ public:
             l->addWidget(w);
         }
         childScrollArea->setWidget(w);
+#if defined(Q_OS_WIN)
+        // Windows can force Qt to create a native window handle for an
+        // intermediate widget and that will block gesture to get touch events.
+        // So this hack to make sure gestures get all touch events they need.
+        foreach (QObject *w, children())
+            if (w->isWidgetType())
+                static_cast<QWidget *>(w)->setAttribute(Qt::WA_AcceptTouchEvents);
+#endif
     }
 private:
     ScrollArea *rootScrollArea;
diff --git a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
index 63d3e76..ce5ef57 100644
--- a/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
+++ b/tests/manual/gestures/scrollarea/mousepangesturerecognizer.cpp
@@ -57,8 +57,16 @@ QGesture* MousePanGestureRecognizer::createGesture(QObject *)
 QGestureRecognizer::Result MousePanGestureRecognizer::filterEvent(QGesture *state, QObject *, QEvent *event)
 {
     QPanGesture *g = static_cast<QPanGesture *>(state);
+    if (event->type() == QEvent::TouchBegin) {
+        // ignore the following mousepress event
+        g->setProperty("ignoreMousePress", QVariant::fromValue<bool>(true));
+    } else if (event->type() == QEvent::TouchEnd) {
+        g->setProperty("ignoreMousePress", QVariant::fromValue<bool>(false));
+    }
     QMouseEvent *me = static_cast<QMouseEvent *>(event);
-    if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick) {
+    if (event->type() == QEvent::MouseButtonPress) {
+        if (g->property("ignoreMousePress").toBool())
+            return QGestureRecognizer::Ignore;
         g->setHotSpot(me->globalPos());
         g->setProperty("lastPos", me->globalPos());
         g->setProperty("pressed", QVariant::fromValue<bool>(true));
@@ -76,7 +84,8 @@ QGestureRecognizer::Result MousePanGestureRecognizer::filterEvent(QGesture *stat
         }
         return QGestureRecognizer::NotGesture;
     } else if (event->type() == QEvent::MouseButtonRelease) {
-        return QGestureRecognizer::GestureFinished | QGestureRecognizer::ConsumeEventHint;
+        if (g->property("pressed").toBool())
+            return QGestureRecognizer::GestureFinished | QGestureRecognizer::ConsumeEventHint;
     }
     return QGestureRecognizer::Ignore;
 }
@@ -90,5 +99,6 @@ void MousePanGestureRecognizer::reset(QGesture *state)
     g->setAcceleration(0);
     g->setProperty("lastPos", QVariant());
     g->setProperty("pressed", QVariant::fromValue<bool>(false));
+    g->setProperty("ignoreMousePress", QVariant::fromValue<bool>(false));
     QGestureRecognizer::reset(state);
 }