Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/qml/qml/qqmltypeloader.cpp

Change-Id: If9874faf23e813b05ee4cf042133a528d73ba72a

1 files changed, 8 insertions, 1 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index b0b747a5eb..9b95dce3a8 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2234,8 +2234,10 @@ QQuickPointerEvent *QQuickWindowPrivate::queryPointerEventInstance(QQuickPointer
     for (QQuickPointerEvent *e : pointerEventInstances) {
         // If device can generate native gestures (e.g. a trackpad), there might be two QQuickPointerEvents:
         // QQuickPointerNativeGestureEvent and QQuickPointerTouchEvent.  Use eventType to disambiguate.
+#if QT_CONFIG(gestures)
         if (eventType == QEvent::NativeGesture && !qobject_cast<QQuickPointerNativeGestureEvent*>(e))
             continue;
+#endif
         // Otherwise we assume there's only one event type per device.
         // More disambiguation tests might need to be added above if that changes later.
         if (e->device() == device)
@@ -2259,9 +2261,11 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic
         break;
     case QQuickPointerDevice::TouchPad:
     case QQuickPointerDevice::TouchScreen:
+#if QT_CONFIG(gestures)
         if (eventType == QEvent::NativeGesture)
             ev = new QQuickPointerNativeGestureEvent(q, device);
         else // assume QEvent::Type is one of TouchBegin/Update/End
+#endif
             ev = new QQuickPointerTouchEvent(q, device);
         break;
     default:
@@ -2296,9 +2300,11 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QEvent *event) con
         dev = QQuickPointerDevice::touchDevice(static_cast<QTouchEvent *>(event)->device());
         break;
     // TODO tablet event types
+#if QT_CONFIG(gestures)
     case QEvent::NativeGesture:
         dev = QQuickPointerDevice::touchDevice(static_cast<QNativeGestureEvent *>(event)->device());
         break;
+#endif
     default:
         break;
     }
@@ -2320,8 +2326,9 @@ void QQuickWindowPrivate::deliverPointerEvent(QQuickPointerEvent *event)
         deliverMouseEvent(event->asPointerMouseEvent());
         // failsafe: never allow any kind of grab to persist after release
         if (event->isReleaseEvent() && event->buttons() == Qt::NoButton) {
+            QQuickItem *oldGrabber = q->mouseGrabberItem();
             event->clearGrabbers();
-            sendUngrabEvent(q->mouseGrabberItem(), false);
+            sendUngrabEvent(oldGrabber, false);
         }
     } else if (event->asPointerTouchEvent()) {
         deliverTouchEvent(event->asPointerTouchEvent());