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

Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/qtquickcontrols2.qdocconf
	src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/quicktemplates2/qquicktooltip.cpp
	src/quicktemplates2/qquicktooltip_p.h
	src/quicktemplates2/qquicktumbler.cpp
	tests/auto/controls/data/tst_spinbox.qml
	tests/auto/controls/data/tst_tumbler.qml
	tests/auto/qquickmaterialstyle/data/tst_material.qml

Change-Id: I25b7473b47739043b6f768603bece30b18021318

1 files changed, 70 insertions, 6 deletions

diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 1e6ecf01..d9c95dbf 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -156,8 +156,10 @@ TestCase {
 
     function test_delay_data() {
         return [
-            {tag: "0", delay: 0},
-            {tag: "100", delay: 100},
+            {tag: "imperative:0", delay: 0, imperative: true},
+            {tag: "imperative:100", delay: 100, imperative: true},
+            {tag: "declarative:0", delay: 0, imperative: false},
+            {tag: "declarative:100", delay: 100, imperative: false}
         ]
     }
 
@@ -165,18 +167,31 @@ TestCase {
         var control = toolTip.createObject(testCase, {delay: data.delay})
 
         compare(control.visible, false)
-        control.open()
+        if (data.imperative)
+            control.open()
+        else
+            control.visible = true
         compare(control.visible, data.delay <= 0)
         tryCompare(control, "visible", true)
 
         control.destroy()
     }
 
-    function test_timeout() {
+    function test_timeout_data() {
+        return [
+            {tag: "imperative", imperative: true},
+            {tag: "declarative", imperative: false}
+        ]
+    }
+
+    function test_timeout(data) {
         var control = toolTip.createObject(testCase, {timeout: 100})
 
         compare(control.visible, false)
-        control.open()
+        if (data.imperative)
+            control.open()
+        else
+            control.visible = true
         compare(control.visible, true)
         tryCompare(control, "visible", false)
 
@@ -185,6 +200,55 @@ TestCase {
 
     function test_warning() {
         ignoreWarning(Qt.resolvedUrl("tst_tooltip.qml") + ":68:5: QML QtObject: ToolTip must be attached to an Item")
-        object.ToolTip.text = ""
+        ignoreWarning("<Unknown File>:1:30: QML ToolTip: cannot find any window to open popup in.")
+        object.ToolTip.show("") // don't crash (QTBUG-56243)
+    }
+
+    Component {
+        id: toolTipWithExitTransition
+
+        ToolTip {
+            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 }
+            }
+        }
+    }
+
+    function test_makeVisibleWhileExitTransitionRunning_data() {
+        return [
+            { tag: "imperative", imperative: true },
+            { tag: "declarative", imperative: false }
+        ]
+    }
+
+    function test_makeVisibleWhileExitTransitionRunning(data) {
+        var control = toolTipWithExitTransition.createObject(testCase)
+
+        // Show, hide, and show the tooltip again. Its exit transition should
+        // start and get cancelled, and then its enter transition should run.
+        if (data.imperative)
+            control.open()
+        else
+            control.visible = true
+        tryCompare(control, "opacity", 1)
+
+        if (data.imperative)
+            control.close()
+        else
+            control.visible = false
+        verify(control.exit.running)
+        wait(100) // TODO: replace with tryVerify() in 5.8
+        verify(control.opacity < 1)
+
+        if (data.imperative)
+            control.open()
+        else
+            control.visible = true
+        tryCompare(control, "opacity", 1)
+
+        control.destroy()
     }
 }