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

Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_scrollindicator.qml

Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b

1 files changed, 9 insertions, 15 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 6927699c..81e50642 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -384,15 +384,10 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
 {
     switch (event->type()) {
     case QEvent::TouchBegin:
-        for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
-            if (acceptTouch(point))
-                return handlePress(item, item->mapToScene(point.pos()), event->timestamp());
-        }
-        break;
-
     case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
         for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
-            if (!acceptTouch(point))
+            if (!acceptTouch(point) && !blockInput(item, point.pos()))
                 continue;
 
             switch (point.state()) {
@@ -408,13 +403,6 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
         }
         break;
 
-    case QEvent::TouchEnd:
-        for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
-            if (acceptTouch(point))
-                return handleRelease(item, item->mapToScene(point.pos()), event->timestamp());
-        }
-        break;
-
     case QEvent::TouchCancel:
         handleUngrab();
         break;
@@ -493,7 +481,13 @@ void QQuickPopupPrivate::finalizeExitTransition()
     destroyOverlay();
 
     if (hadActiveFocusBeforeExitTransition && window) {
-        if (!qobject_cast<QQuickPopupItem *>(window->activeFocusItem())) {
+        // restore focus to the next popup in chain, or to the window content if there are no other popups open
+        QQuickPopup *popup = nullptr;
+        if (QQuickOverlay *overlay = QQuickOverlay::overlay(window))
+            popup = QQuickOverlayPrivate::get(overlay)->stackingOrderPopups().value(0);
+        if (popup && popup->hasFocus()) {
+            popup->forceActiveFocus();
+        } else {
             QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
             if (applicationWindow)
                 applicationWindow->contentItem()->setFocus(true);