Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1

Change-Id: Iff02839c8ace49582750e06fa1ea9c559f6c93fe

11 files changed, 73 insertions, 14 deletions

diff --git a/src/imports/controls/fusion/qquickfusiondial.cpp b/src/imports/controls/fusion/qquickfusiondial.cpp
index 182f5c0f..50436634 100644
--- a/src/imports/controls/fusion/qquickfusiondial.cpp
+++ b/src/imports/controls/fusion/qquickfusiondial.cpp
@@ -84,7 +84,7 @@ void QQuickFusionDial::paint(QPainter *painter)
 
     QColor buttonColor = m_palette.button().color();
     const bool enabled = isEnabled();
-    qreal r = qMin(width, height) / 2;
+    qreal r = qMin(width, height) / 2.0;
     r -= r/50;
     const qreal penSize = r/20.0;
 
diff --git a/src/imports/controls/qquickdefaultbusyindicator.cpp b/src/imports/controls/qquickdefaultbusyindicator.cpp
index 98a3cae3..aca795d9 100644
--- a/src/imports/controls/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/qquickdefaultbusyindicator.cpp
@@ -124,7 +124,7 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
         Q_ASSERT(rectNode->type() == QSGNode::GeometryNodeType);
 
         QPointF pos = QPointF(sz / 2 - circleRadius, sz / 2 - circleRadius);
-        pos = moveCircle(pos, 360 / CircleCount * i, sz / 2 - circleRadius);
+        pos = moveCircle(pos, 360.0 / CircleCount * i, sz / 2 - circleRadius);
 
         QMatrix4x4 m;
         m.translate(dx + pos.x(), dy + pos.y());
diff --git a/src/imports/controls/qquickdefaultprogressbar.cpp b/src/imports/controls/qquickdefaultprogressbar.cpp
index e8657255..f44065e4 100644
--- a/src/imports/controls/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/qquickdefaultprogressbar.cpp
@@ -59,7 +59,7 @@ static inline qreal blockStartX(int blockIndex)
 
 static inline qreal blockRestX(int blockIndex, qreal availableWidth)
 {
-    const qreal spanRightEdgePos = availableWidth / 2 + BlockSpan / 2;
+    const qreal spanRightEdgePos = availableWidth / 2 + BlockSpan / 2.0;
     return spanRightEdgePos - (blockIndex + 1) * BlockWidth - (blockIndex * BlockRestingSpacing);
 }
 
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 8ce4d0e5..8632e14c 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -178,7 +178,7 @@ void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point)
 
     if (wasPressed) {
         emit q->released();
-        if (!wasHeld)
+        if (!wasHeld && !wasDoubleClick)
             trigger();
     } else {
         emit q->canceled();
@@ -188,6 +188,8 @@ void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point)
         stopPressRepeat();
     else
         stopPressAndHold();
+
+    wasDoubleClick = false;
 }
 
 void QQuickAbstractButtonPrivate::handleUngrab()
@@ -201,6 +203,7 @@ void QQuickAbstractButtonPrivate::handleUngrab()
     q->setPressed(false);
     stopPressRepeat();
     stopPressAndHold();
+    wasDoubleClick = false;
     emit q->canceled();
 }
 
@@ -1080,8 +1083,10 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
 
 void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event)
 {
+    Q_D(QQuickAbstractButton);
     QQuickControl::mouseDoubleClickEvent(event);
     emit doubleClicked();
+    d->wasDoubleClick = true;
 }
 
 void QQuickAbstractButton::timerEvent(QTimerEvent *event)
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index 8ad479e2..9291c1a8 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -124,6 +124,7 @@ public:
     bool autoExclusive = false;
     bool autoRepeat = false;
     bool wasHeld = false;
+    bool wasDoubleClick = false;
     int holdTimer = 0;
     int delayTimer = 0;
     int repeatTimer = 0;
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 9d733c94..8b61375e 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -252,9 +252,18 @@ void QQuickToolTip::setVisible(bool visible)
 {
     Q_D(QQuickToolTip);
     if (visible) {
-        if (!d->visible && d->delay > 0) {
-            d->startDelay();
-            return;
+        if (!d->visible) {
+            // We are being made visible, and we weren't before.
+            if (d->delay > 0) {
+                d->startDelay();
+                return;
+            }
+        } else {
+            // We are being made visible, even though we already were.
+            // We've probably been re-opened before our exit transition could finish.
+            // In that case, we need to manually start the timeout, as that is usually
+            // done in itemChange(), which won't be called in this situation.
+            d->startTimeout();
         }
     } else {
         d->stopDelay();
diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index ee26a6d6..da5642cc 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -887,4 +887,27 @@ TestCase {
         mouseRelease(control)
         compare(clickedSpy.count, 1)
     }
+
+    function test_doubleClick() {
+        let control = createTemporaryObject(button, testCase, { text: "Hello" })
+        verify(control)
+
+        let pressedSpy = signalSpy.createObject(control, { target: control, signalName: "pressed" })
+        verify(pressedSpy.valid)
+
+        let releasedSpy = signalSpy.createObject(control, { target: control, signalName: "released" })
+        verify(releasedSpy.valid)
+
+        let clickedSpy = signalSpy.createObject(control, { target: control, signalName: "clicked" })
+        verify(clickedSpy.valid)
+
+        let doubleClickedSpy = signalSpy.createObject(control, { target: control, signalName: "doubleClicked" })
+        verify(doubleClickedSpy.valid)
+
+        mouseDoubleClickSequence(control)
+        compare(pressedSpy.count, 2)
+        compare(releasedSpy.count, 2)
+        compare(clickedSpy.count, 1)
+        compare(doubleClickedSpy.count, 1)
+    }
 }
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index bd4fe80e..83a6ea61 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -152,8 +152,7 @@ TestCase {
                                         "doubleClicked",
                                         ["pressedChanged", { "pressed": false }],
                                         ["downChanged", { "down": false }],
-                                        "released",
-                                        "clicked"]
+                                        "released"]
         mouseDoubleClickSequence(control, control.width / 2, control.height / 2, Qt.LeftButton)
         verify(sequenceSpy.success)
     }
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml
index 2560177d..e965b5ef 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/controls/data/tst_delaybutton.qml
@@ -173,8 +173,7 @@ TestCase {
                                         "doubleClicked",
                                         ["pressedChanged", { "pressed": false }],
                                         ["downChanged", { "down": false }],
-                                        "released",
-                                        "clicked"]
+                                        "released"]
         mouseDoubleClickSequence(control, control.width / 2, control.height / 2, Qt.LeftButton)
         verify(sequenceSpy.success)
     }
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 3e2ff460..71eb0b99 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -654,8 +654,7 @@ TestCase {
             "pressed",
             "doubleClicked",
             ["pressedChanged", { "pressed": false }],
-            "released",
-            "clicked"
+            "released"
         ];
         mouseDoubleClickSequence(control, control.width / 2, control.height / 2, Qt.LeftButton);
         verify(mouseSignalSequenceSpy.success);
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index d98a7cc8..adea23ef 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -227,15 +227,39 @@ TestCase {
         id: toolTipWithExitTransition
 
         ToolTip {
+            Component.onCompleted: contentItem.objectName = "contentItem"
+
             enter: Transition {
                 NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 100 }
             }
             exit: Transition {
-                NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 1000 }
+                NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 500 }
             }
         }
     }
 
+    function test_openDuringExitTransitionWithTimeout() {
+        let control = createTemporaryObject(toolTipWithExitTransition, testCase, { timeout: 250 })
+        verify(control)
+        control.open()
+        verify(control.visible)
+        // Can't be fully open yet because the enter transition has only just started.
+        compare(control.opened, false)
+        compare(control.enter.running, true)
+        tryCompare(control, "opened", true)
+
+        // Let it timeout and begin the exit transition.
+        tryCompare(control, "opened", false)
+        verify(control.visible)
+        tryCompare(control.exit, "running", true)
+        verify(control.visible)
+
+        // Quickly open it again; it should still timeout eventually.
+        control.open()
+        tryCompare(control, "opened", true)
+        tryCompare(control.exit, "running", true)
+    }
+
     function test_makeVisibleWhileExitTransitionRunning_data() {
         return [
             { tag: "imperative", imperative: true },