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

Conflicts:
	src/imports/controls/SpinBox.qml
	src/imports/controls/material/SpinBox.qml
	src/imports/controls/universal/SpinBox.qml
	tests/auto/controls/data/tst_swipedelegate.qml

Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5

1 files changed, 12 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 55fecb15..27b66aee 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -194,6 +194,13 @@ void QQuickOverlayPrivate::removePopup(QQuickPopup *popup)
         q->setVisible(!allDrawers.isEmpty() || !q->childItems().isEmpty());
 }
 
+void QQuickOverlayPrivate::setMouseGrabberPopup(QQuickPopup *popup)
+{
+    if (popup && !popup->isVisible())
+        popup = nullptr;
+    mouseGrabberPopup = popup;
+}
+
 QQuickOverlay::QQuickOverlay(QQuickItem *parent)
     : QQuickItem(*(new QQuickOverlayPrivate), parent)
 {
@@ -327,7 +334,7 @@ void QQuickOverlay::mousePressEvent(QMouseEvent *event)
         for (QQuickDrawer *drawer : drawers) {
             QQuickDrawerPrivate *p = QQuickDrawerPrivate::get(drawer);
             if (p->startDrag(window(), event)) {
-                d->mouseGrabberPopup = drawer;
+                d->setMouseGrabberPopup(drawer);
                 return;
             }
         }
@@ -337,7 +344,7 @@ void QQuickOverlay::mousePressEvent(QMouseEvent *event)
         const auto popups = d->stackingOrderPopups();
         for (QQuickPopup *popup : popups) {
             if (popup->overlayEvent(this, event)) {
-                d->mouseGrabberPopup = popup;
+                d->setMouseGrabberPopup(popup);
                 return;
             }
         }
@@ -360,7 +367,7 @@ void QQuickOverlay::mouseReleaseEvent(QMouseEvent *event)
 
     if (d->mouseGrabberPopup) {
         d->mouseGrabberPopup->overlayEvent(this, event);
-        d->mouseGrabberPopup = nullptr;
+        d->setMouseGrabberPopup(nullptr);
     } else {
         const auto popups = d->stackingOrderPopups();
         for (QQuickPopup *popup : popups) {
@@ -406,7 +413,7 @@ bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
             case QEvent::MouseButtonPress:
                 emit pressed();
                 if (popup->overlayEvent(item, event)) {
-                    d->mouseGrabberPopup = popup;
+                    d->setMouseGrabberPopup(popup);
                     return true;
                 }
                 break;
@@ -414,7 +421,7 @@ bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
                 return popup->overlayEvent(item, event);
             case QEvent::MouseButtonRelease:
                 emit released();
-                d->mouseGrabberPopup = nullptr;
+                d->setMouseGrabberPopup(nullptr);
                 return popup->overlayEvent(item, event);
             default:
                 break;