Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I53fc18c168daff6dfb504e5a64e20570de7d24ac

4 files changed, 21 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 983f2651..2099f2db 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -105,6 +105,7 @@ QT_BEGIN_NAMESPACE
     \qmlsignal QtQuick.Controls::AbstractButton::pressAndHold()
 
     This signal is emitted when the button is interactively pressed and held down by the user via touch or mouse.
+    It is not emitted when \l autoRepeat is enabled.
 */
 
 /*!
@@ -658,6 +659,9 @@ void QQuickAbstractButton::setAutoExclusive(bool exclusive)
     This property holds whether the button repeats \l pressed(), \l released()
     and \l clicked() signals while the button is pressed and held down.
 
+    If this property is set to \c true, the \l pressAndHold() signal will not
+    be emitted.
+
     The default value is \c false.
 
     The initial delay and the repetition interval are defined in milliseconds
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index e32fdb28..8a85f914 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -187,7 +187,7 @@ public:
     QQuickPopup::ClosePolicy closePolicy = DefaultClosePolicy;
     QQuickItem *parentItem = nullptr;
     QQuickItem *dimmer = nullptr;
-    QQuickWindow *window = nullptr;
+    QPointer<QQuickWindow> window;
     QQuickTransition *enter = nullptr;
     QQuickTransition *exit = nullptr;
     QQuickPopupItem *popupItem = nullptr;
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index c1271dab..0a36e0c7 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -238,12 +238,13 @@ void QQuickToolTip::setTimeout(int timeout)
     if (d->timeout == timeout)
         return;
 
+    d->timeout = timeout;
+
     if (timeout <= 0)
         d->stopTimeout();
     else if (isVisible())
         d->startTimeout();
 
-    d->timeout = timeout;
     emit timeoutChanged();
 }
 
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index 8b702c60..85c70b1b 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -949,9 +949,20 @@ void QQuickTumblerAttachedPrivate::calculateDisplacement()
         const qreal contentY = tumblerPrivate->viewContentY;
         const qreal delegateH = delegateHeight(tumbler);
         const qreal preferredHighlightBegin = tumblerPrivate->view->property("preferredHighlightBegin").toReal();
-        // Tumbler's displacement goes from negative at the top to positive towards the bottom, so we must switch this around.
-        const qreal reverseDisplacement = (contentY + preferredHighlightBegin) / delegateH;
-        displacement = reverseDisplacement - index;
+        const qreal itemY = qobject_cast<QQuickItem*>(parent)->y();
+        qreal currentItemY = 0;
+        auto currentItem = tumblerPrivate->view->property("currentItem").value<QQuickItem*>();
+        if (currentItem)
+            currentItemY = currentItem->y();
+        // Start from the y position of the current item.
+        const qreal topOfCurrentItemInViewport = currentItemY - contentY;
+        // Then, calculate the distance between it and the preferredHighlightBegin.
+        const qreal relativePositionToPreferredHighlightBegin = topOfCurrentItemInViewport - preferredHighlightBegin;
+        // Next, calculate the distance between us and the current item.
+        const qreal distanceFromCurrentItem = currentItemY - itemY;
+        const qreal displacementInPixels = distanceFromCurrentItem - relativePositionToPreferredHighlightBegin;
+        // Convert it from pixels to a floating point index.
+        displacement = displacementInPixels / delegateH;
     }
 
     emitIfDisplacementChanged(previousDisplacement, displacement);