Dont create native winid when not required.

When Windows doesn't support native gestures, we shouldn't create a native
winid. Also, there is no reason to create winid on all ancestors.

Reviewed-by: Trond

1 files changed, 8 insertions, 3 deletions

diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 22a94b9..95ef1cf 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -2033,9 +2033,12 @@ void QWidgetPrivate::registerTouchWindow()
 void QWidgetPrivate::winSetupGestures()
 {
     Q_Q(QWidget);
-    if (!q || !q->isVisible())
+    if (!q || !q->isVisible() || !nativeGesturePanEnabled)
         return;
+
     QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
+    if (!qAppPriv->SetGestureConfig)
+        return;
     WId winid = q->internalWinId();
 
     bool needh = false;
@@ -2052,10 +2055,12 @@ void QWidgetPrivate::winSetupGestures()
         needv = (vbarpolicy == Qt::ScrollBarAlwaysOn ||
                  (vbarpolicy == Qt::ScrollBarAsNeeded && vbar->minimum() < vbar->maximum()));
         singleFingerPanEnabled = asa->d_func()->singleFingerPanEnabled;
-        if (!winid)
+        if (!winid) {
+            q->setAttribute(Qt::WA_DontCreateNativeAncestors);
             winid = q->winId(); // enforces the native winid on the viewport
+        }
     }
-    if (winid && qAppPriv->SetGestureConfig) {
+    if (winid) {
         GESTURECONFIG gc[1];
         memset(gc, 0, sizeof(gc));
         gc[0].dwID = GID_PAN;