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, 60 insertions, 3 deletions

diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 4db8c439..5ae1e0a6 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -62,7 +62,17 @@ TestCase {
     }
 
     Component {
+        id: signalSpy
+        SignalSpy { }
+    }
+
+    Component {
         id: comboBox
+        ComboBox { }
+    }
+
+    Component {
+        id: emptyBox
         ComboBox {
             delegate: ItemDelegate {
                 width: popup.width
@@ -131,7 +141,7 @@ TestCase {
     }
 
     function test_objects() {
-        var control = comboBox.createObject(testCase)
+        var control = emptyBox.createObject(testCase)
         verify(control)
 
         var items = [
@@ -238,7 +248,7 @@ TestCase {
     }
 
     function test_textRole(data) {
-        var control = comboBox.createObject(testCase)
+        var control = emptyBox.createObject(testCase)
         verify(control)
 
         control.model = data.model
@@ -443,7 +453,7 @@ TestCase {
         keyClick(Qt.Key_Space)
 
         compare(control.currentIndex, 1)
-        compare(control.highlightedIndex, -1)
+        tryCompare(control, "highlightedIndex", -1)
 
         control.destroy()
     }
@@ -861,4 +871,51 @@ TestCase {
 
         control.destroy()
     }
+
+    // QTBUG-55030
+    function test_highlightRange() {
+        var control = comboBox.createObject(testCase, {model: 100})
+        verify(control)
+
+        control.currentIndex = 50
+        compare(control.currentIndex, 50)
+        compare(control.highlightedIndex, -1)
+
+        var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
+        verify(openedSpy.valid)
+
+        control.popup.open()
+        compare(control.highlightedIndex, 50)
+        tryCompare(openedSpy, "count", 1)
+
+        var listview = control.popup.contentItem
+        verify(listview)
+
+        var first = listview.itemAt(0, listview.contentY)
+        verify(first)
+        compare(first.text, "50")
+
+        var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"})
+        verify(closedSpy.valid)
+
+        control.popup.close()
+        tryCompare(closedSpy, "count", 1)
+        compare(control.highlightedIndex, -1)
+
+        control.currentIndex = 99
+        compare(control.currentIndex, 99)
+        compare(control.highlightedIndex, -1)
+
+        control.popup.open()
+        compare(control.highlightedIndex, 99)
+        tryCompare(openedSpy, "count", 2)
+
+        var last = listview.itemAt(0, listview.contentY + listview.height - 1)
+        verify(last)
+        compare(last.text, "99")
+
+        openedSpy.target = null
+        closedSpy.target = null
+        control.destroy()
+    }
 }