1 files changed, 55 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 6b845ae6..a719efd3 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -158,9 +158,6 @@ QQuickControlPrivate::QQuickControlPrivate()
 
 QQuickControlPrivate::~QQuickControlPrivate()
 {
-#if QT_CONFIG(accessibility)
-    QAccessible::removeActivationObserver(this);
-#endif
 }
 
 void QQuickControlPrivate::init()
@@ -180,6 +177,20 @@ bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
         return true;
     }
 
+    // If the control is on a Flickable that has a pressDelay, the press is sent
+    // as a mouse event rather than touch; so it detect and deal with it.
+    if (touchId == -1 && pressWasTouch) {
+        const auto delta = QVector2D(point.pos() - previousPressPos);
+        const bool overThreshold = QQuickWindowPrivate::dragOverThreshold(delta);
+        if (point.state() == Qt::TouchPointReleased && !overThreshold) {
+            // touchpoint was released near the press position: don't expect any more events, but just handle the release
+            return true;
+        } else if (point.state() == Qt::TouchPointMoved && overThreshold) {
+            // touchpoint was dragged over the drag threshold: accept it, and remember to handle all moves from now on
+            touchId = point.id();
+            return true;
+        }
+    }
     return false;
 }
 #endif
@@ -215,6 +226,8 @@ void QQuickControlPrivate::handleRelease(const QPointF &)
     if ((focusPolicy & Qt::ClickFocus) == Qt::ClickFocus && QGuiApplication::styleHints()->setFocusOnTouchRelease())
         setActiveFocus(q, Qt::MouseFocusReason);
     touchId = -1;
+    pressWasTouch = false;
+    previousPressPos = QPointF();
 }
 
 void QQuickControlPrivate::handleUngrab()
@@ -840,6 +853,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
         quickCompleteDeferred(q, backgroundName(), background);
 }
 
+/*
+    \internal
+
+    Hides an item that was replaced by a newer one, rather than
+    deleting it, as the item is typically created in QML and hence
+    we don't own it.
+*/
 void QQuickControlPrivate::hideOldItem(QQuickItem *item)
 {
     if (!item)
@@ -850,10 +870,35 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item)
     item->setVisible(false);
     item->setParentItem(nullptr);
 
+#if QT_CONFIG(accessibility)
     // Remove the item from the accessibility tree.
     QQuickAccessibleAttached *accessible = accessibleAttached(item);
     if (accessible)
         accessible->setIgnored(true);
+#endif
+}
+
+/*
+    \internal
+
+    Named "unhide" because it's used for cases where an item
+    that was previously hidden by \l hideOldItem() wants to be
+    shown by a control again, such as a ScrollBar in ScrollView.
+*/
+void QQuickControlPrivate::unhideOldItem(QQuickControl *control, QQuickItem *item)
+{
+    Q_ASSERT(item);
+    qCDebug(lcItemManagement) << "unhiding old item" << item;
+
+    item->setVisible(true);
+    item->setParentItem(control);
+
+#if QT_CONFIG(accessibility)
+    // Add the item back in to the accessibility tree.
+    QQuickAccessibleAttached *accessible = accessibleAttached(item);
+    if (accessible)
+        accessible->setIgnored(false);
+#endif
 }
 
 void QQuickControlPrivate::updateBaselineOffset()
@@ -958,6 +1003,9 @@ QQuickControl::~QQuickControl()
     Q_D(QQuickControl);
     d->removeImplicitSizeListener(d->background, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry);
     d->removeImplicitSizeListener(d->contentItem);
+#if QT_CONFIG(accessibility)
+    QAccessible::removeActivationObserver(d);
+#endif
 }
 
 void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
@@ -2121,6 +2169,10 @@ void QQuickControl::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QQuickControl);
     d->handlePress(event->localPos());
+    if (event->source() == Qt::MouseEventSynthesizedByQt) {
+        d->pressWasTouch = true;
+        d->previousPressPos = event->localPos();
+    }
     event->accept();
 }