diff --git a/tests/auto/quickcontrols/controls/data/tst_combobox.qml b/tests/auto/quickcontrols/controls/data/tst_combobox.qml index f208c163bc..3598815ad1 100644 --- a/tests/auto/quickcontrols/controls/data/tst_combobox.qml +++ b/tests/auto/quickcontrols/controls/data/tst_combobox.qml @@ -82,6 +82,8 @@ TestCase { } function init() { + failOnWarning(/.?/) + // QTBUG-61225: Move the mouse away to avoid QQuickDeliveryAgentPrivate::flushFrameSynchronousEvents() // delivering interfering hover events based on the last mouse position from earlier tests. For // example, ComboBox::test_activation() kept receiving hover events for the last mouse position @@ -90,9 +92,7 @@ TestCase { } function test_defaults() { - failOnWarning(/.?/) - - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) compare(control.count, 0) @@ -114,10 +114,10 @@ TestCase { } function test_array() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) - var items = [ "Banana", "Apple", "Coconut" ] + let items = [ "Banana", "Apple", "Coconut" ] control.model = items compare(control.model, items) @@ -138,10 +138,10 @@ TestCase { } function test_objects() { - var control = createTemporaryObject(emptyBox, testCase) + let control = createTemporaryObject(emptyBox, testCase) verify(control) - var items = [ + let items = [ { text: "Apple" }, { text: "Orange" }, { text: "Banana" } @@ -166,12 +166,12 @@ TestCase { } function test_qobjects() { - var control = createTemporaryObject(emptyBox, testCase, {textRole: "text"}) + let control = createTemporaryObject(emptyBox, testCase, {textRole: "text"}) verify(control) - var obj1 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'one' }", control) - var obj2 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'two' }", control) - var obj3 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'three' }", control) + let obj1 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'one' }", control) + let obj2 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'two' }", control) + let obj3 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'three' }", control) control.model = [obj1, obj2, obj3] @@ -191,7 +191,7 @@ TestCase { } function test_number() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) control.model = 10 @@ -222,7 +222,7 @@ TestCase { } function test_listModel() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) control.model = listmodel @@ -282,7 +282,7 @@ TestCase { } function test_textRole(data) { - var control = createTemporaryObject(emptyBox, testCase) + let control = createTemporaryObject(emptyBox, testCase) verify(control) control.model = data.model @@ -308,7 +308,7 @@ TestCase { } function test_textAt() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) control.model = ["Apple", "Orange", "Banana"] @@ -348,7 +348,7 @@ TestCase { } function test_find(data) { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) control.model = ["Banana", "banana", "Coconut", "Apple", "Cocomuffin"] @@ -364,7 +364,7 @@ TestCase { } function test_valueRole(data) { - var control = createTemporaryObject(emptyBox, testCase, + let control = createTemporaryObject(emptyBox, testCase, { model: data.model, valueRole: "color" }) verify(control) compare(control.count, 3) @@ -391,7 +391,7 @@ TestCase { } function test_valueAt() { - var control = createTemporaryObject(comboBox, testCase, + let control = createTemporaryObject(comboBox, testCase, { model: fruitmodel, textRole: "name", valueRole: "color" }) verify(control) @@ -412,7 +412,7 @@ TestCase { } function test_indexOfValue(data) { - var control = createTemporaryObject(comboBox, testCase, + let control = createTemporaryObject(comboBox, testCase, { model: fruitmodel, textRole: "name", valueRole: "color" }) verify(control) @@ -452,20 +452,20 @@ TestCase { } function test_arrowKeys() { - var control = createTemporaryObject(comboBox, testCase, + let control = createTemporaryObject(comboBox, testCase, { model: fruitmodel, textRole: "name", valueRole: "color" }) verify(control) - var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) + let activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) - var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) + let highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) verify(highlightedSpy.valid) - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) - var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) + let closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) verify(closedSpy.valid) control.forceActiveFocus() @@ -602,10 +602,10 @@ TestCase { } function test_keys_space_enter_escape(data) { - var control = createTemporaryObject(comboBox, testCase, {model: 3}) + let control = createTemporaryObject(comboBox, testCase, {model: 3}) verify(control) - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) control.forceActiveFocus() @@ -633,7 +633,7 @@ TestCase { } function test_keys_home_end() { - var control = createTemporaryObject(comboBox, testCase, {model: 5}) + let control = createTemporaryObject(comboBox, testCase, {model: 5}) verify(control) control.forceActiveFocus() @@ -641,20 +641,20 @@ TestCase { compare(control.currentIndex, 0) compare(control.highlightedIndex, -1) - var activatedCount = 0 - var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) + let activatedCount = 0 + let activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) - var highlightedCount = 0 - var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) + let highlightedCount = 0 + let highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) verify(highlightedSpy.valid) - var currentIndexCount = 0 - var currentIndexSpy = signalSpy.createObject(control, {target: control, signalName: "currentIndexChanged"}) + let currentIndexCount = 0 + let currentIndexSpy = signalSpy.createObject(control, {target: control, signalName: "currentIndexChanged"}) verify(currentIndexSpy.valid) - var highlightedIndexCount = 0 - var highlightedIndexSpy = signalSpy.createObject(control, {target: control, signalName: "highlightedIndexChanged"}) + let highlightedIndexCount = 0 + let highlightedIndexSpy = signalSpy.createObject(control, {target: control, signalName: "highlightedIndexChanged"}) verify(highlightedIndexSpy.valid) // end (popup closed) @@ -744,7 +744,7 @@ TestCase { } function test_keySearch() { - var control = createTemporaryObject(comboBox, testCase, {model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]}) + let control = createTemporaryObject(comboBox, testCase, {model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]}) verify(control) control.forceActiveFocus() @@ -839,7 +839,7 @@ TestCase { } function test_popup() { - var control = createTemporaryObject(comboBox, testCase, {model: 3}) + let control = createTemporaryObject(comboBox, testCase, {model: 3}) verify(control) // show below @@ -880,7 +880,7 @@ TestCase { compare(control.pressed, false) tryCompare(control.popup, "visible", false) control.y = control.Window.height - (control.popup.contentItem.height * 0.99) - var popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.popup, signalName: "yChanged"}) + let popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.popup, signalName: "yChanged"}) verify(popupYSpy.valid) mousePress(control) compare(control.pressed, true) @@ -893,7 +893,7 @@ TestCase { } } - var leftLayoutMargin = control.background.layoutMargins === undefined ? 0 : control.popup.layoutMargins.left + let leftLayoutMargin = control.background.layoutMargins === undefined ? 0 : control.popup.layoutMargins.left // follow the control outside the horizontal window bounds const prevX = control.popup.contentItem.parent.mapToGlobal(0, 0).x control.x = -control.width / 2 @@ -941,13 +941,13 @@ TestCase { // This test checks that when reopening the combobox that it is still appears at the same y position as // previously function test_reopen_popup() { - var control = createTemporaryObject(reopenCombo, testCase) + let control = createTemporaryObject(reopenCombo, testCase) verify(control) - var y = 0; - for (var i = 0; i < 2; ++i) { + let y = 0; + for (let i = 0; i < 2; ++i) { tryCompare(control.innerCombo.popup, "visible", false) control.innerCombo.y = control.height - (control.innerCombo.popup.contentItem.height * 0.99) - var popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.innerCombo.popup, signalName: "yChanged"}) + let popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.innerCombo.popup, signalName: "yChanged"}) verify(popupYSpy.valid) mousePress(control.innerCombo) compare(control.innerCombo.pressed, true) @@ -975,16 +975,16 @@ TestCase { } function test_mouse() { - var control = createTemporaryObject(comboBox, testCase, {model: 3, hoverEnabled: false}) + let control = createTemporaryObject(comboBox, testCase, {model: 3, hoverEnabled: false}) verify(control) - var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) + let activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) mouseClick(control) compare(control.popup.visible, true) - var content = control.popup.contentItem + let content = control.popup.contentItem waitForRendering(content) // press - move - release outside - not activated - not closed @@ -1007,22 +1007,22 @@ TestCase { } function test_touch() { - var control = createTemporaryObject(comboBox, testCase, {model: 3}) + let control = createTemporaryObject(comboBox, testCase, {model: 3}) verify(control) - var touch = touchEvent(control) + let touch = touchEvent(control) - var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) + let activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) - var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) + let highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) verify(highlightedSpy.valid) touch.press(0, control).commit() touch.release(0, control).commit() compare(control.popup.visible, true) - var content = control.popup.contentItem + let content = control.popup.contentItem waitForRendering(content) // press - move - release outside - not activated - not closed @@ -1052,7 +1052,7 @@ TestCase { } function test_down() { - var control = createTemporaryObject(comboBox, testCase, {model: 3}) + let control = createTemporaryObject(comboBox, testCase, {model: 3}) verify(control) // some styles position the popup over the combo button. move it out @@ -1060,10 +1060,10 @@ TestCase { // combinations of the button being pressed and the popup being visible. control.popup.y = control.height - var downSpy = signalSpy.createObject(control, {target: control, signalName: "downChanged"}) + let downSpy = signalSpy.createObject(control, {target: control, signalName: "downChanged"}) verify(downSpy.valid) - var pressedSpy = signalSpy.createObject(control, {target: control, signalName: "pressedChanged"}) + let pressedSpy = signalSpy.createObject(control, {target: control, signalName: "pressedChanged"}) verify(pressedSpy.valid) mousePress(control) @@ -1119,13 +1119,13 @@ TestCase { } function test_focus() { - var control = createTemporaryObject(comboBox, testCase, {model: 3}) + let control = createTemporaryObject(comboBox, testCase, {model: 3}) verify(control) - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) - var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) + let closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) verify(openedSpy.valid) // click - gain focus - show popup @@ -1144,7 +1144,7 @@ TestCase { } function test_baseline() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) } @@ -1162,7 +1162,7 @@ TestCase { } function test_displayText() { - var control = createTemporaryObject(displayBox, testCase) + let control = createTemporaryObject(displayBox, testCase) verify(control) compare(control.displayText, "First") @@ -1208,8 +1208,8 @@ TestCase { } function getChild(control, objname, idx) { - var index = idx - for (var i = index+1; i < control.children.length; i++) + let index = idx + for (let i = index+1; i < control.children.length; i++) { if (control.children[i].objectName === objname) { index = i @@ -1220,29 +1220,29 @@ TestCase { } function test_font() { // QTBUG_50984, QTBUG-51696 - var control = createTemporaryObject(component, testCase) + let control = createTemporaryObject(component, testCase) verify(control) verify(control.button) verify(control.combobox) - var expectedComboBoxFontPixelSize = 30 + let expectedComboBoxFontPixelSize = 30 compare(control.font.pixelSize, 30) compare(control.button.font.pixelSize, 20) compare(control.combobox.font.pixelSize, expectedComboBoxFontPixelSize) // verify(control.combobox.popup) -// var popup = control.combobox.popup +// let popup = control.combobox.popup // popup.open() // verify(popup.contentItem) -// var listview = popup.contentItem +// let listview = popup.contentItem // verify(listview.contentItem) // waitForRendering(listview) -// var idx1 = getChild(listview.contentItem, "delegate", -1) +// let idx1 = getChild(listview.contentItem, "delegate", -1) // compare(listview.contentItem.children[idx1].font.pixelSize, 25) -// var idx2 = getChild(listview.contentItem, "delegate", idx1) +// let idx2 = getChild(listview.contentItem, "delegate", idx1) // compare(listview.contentItem.children[idx2].font.pixelSize, 25) // compare(listview.contentItem.children[idx1].font.pixelSize, 25) @@ -1266,15 +1266,15 @@ TestCase { } function test_wheel() { - var ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100}) + let ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100}) verify(ma) - var control = comboBox.createObject(ma, {model: 2, wheelEnabled: true}) + let control = comboBox.createObject(ma, {model: 2, wheelEnabled: true}) verify(control) - var delta = 120 + let delta = 120 - var spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"}) + let spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"}) verify(spy.valid) mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) @@ -1307,14 +1307,14 @@ TestCase { // QTBUG-51645 function test_activation(data) { - var control = createTemporaryObject(comboBox, testCase, {currentIndex: 1, model: ["Apple", "Orange", "Banana"]}) + let control = createTemporaryObject(comboBox, testCase, {currentIndex: 1, model: ["Apple", "Orange", "Banana"]}) verify(control) control.forceActiveFocus() verify(control.activeFocus) if (data.open) { - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) keyClick(Qt.Key_Space) @@ -1347,7 +1347,7 @@ TestCase { // QTBUG-51972 function test_async() { - var loader = createTemporaryObject(asyncLoader, testCase) + let loader = createTemporaryObject(asyncLoader, testCase) verify(loader) loader.active = true @@ -1359,7 +1359,7 @@ TestCase { // QTBUG-52615 function test_currentIndex() { - var control = createTemporaryObject(comboBox, testCase, {currentIndex: -1, model: 3}) + let control = createTemporaryObject(comboBox, testCase, {currentIndex: -1, model: 3}) verify(control) compare(control.currentIndex, -1) @@ -1374,11 +1374,11 @@ TestCase { // QTBUG-54573 function test_modelReset() { - var control = createTemporaryObject(comboBox, testCase, {model: resetmodel}) + let control = createTemporaryObject(comboBox, testCase, {model: resetmodel}) verify(control) control.popup.open() - var listview = control.popup.contentItem + let listview = control.popup.contentItem verify(listview) tryCompare(listview.contentItem.children, "length", resetmodel.count + 1) // + highlight item @@ -1392,7 +1392,7 @@ TestCase { // QTBUG-55118 function test_currentText() { - var control = createTemporaryObject(comboBox, testCase, {model: listmodel}) + let control = createTemporaryObject(comboBox, testCase, {model: listmodel}) verify(control) compare(control.currentIndex, 0) @@ -1410,28 +1410,28 @@ TestCase { // QTBUG-55030 function test_highlightRange() { - var control = createTemporaryObject(comboBox, testCase, {model: 100}) + let control = createTemporaryObject(comboBox, 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"}) + let 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 + let listview = control.popup.contentItem verify(listview) - var first = listview.itemAt(0, listview.contentY) + let first = listview.itemAt(0, listview.contentY) verify(first) compare(first.text, "50") - var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) + let closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) verify(closedSpy.valid) control.popup.close() @@ -1447,7 +1447,7 @@ TestCase { tryCompare(openedSpy, "count", 2) tryVerify(function() { return listview.height > 0 }) - var last = listview.itemAt(0, listview.contentY + listview.height - 1) + let last = listview.itemAt(0, listview.contentY + listview.height - 1) verify(last) compare(last.text, "99") @@ -1459,27 +1459,27 @@ TestCase { if ((Qt.platform.pluginName === "offscreen") || (Qt.platform.pluginName === "minimal")) skip("Mouse highlight not functional on offscreen/minimal platforms") - var control = createTemporaryObject(comboBox, testCase, {model: 20}) + let control = createTemporaryObject(comboBox, testCase, {model: 20}) verify(control) compare(control.highlightedIndex, -1) - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) control.popup.open() compare(control.highlightedIndex, 0) tryCompare(openedSpy, "count", 1) - var listview = control.popup.contentItem + let listview = control.popup.contentItem verify(listview) waitForRendering(listview) // hover-highlight through all visible list items one by one - var hoverIndex = -1 - var prevHoverItem = null - for (var y = 0; y < listview.height; ++y) { - var hoverItem = listview.itemAt(0, listview.contentY + y) + let hoverIndex = -1 + let prevHoverItem = null + for (let y = 0; y < listview.height; ++y) { + let hoverItem = listview.itemAt(0, listview.contentY + y) if (!hoverItem || !hoverItem.visible || hoverItem === prevHoverItem) continue mouseMove(hoverItem, 0, 0) @@ -1490,15 +1490,15 @@ TestCase { mouseMove(listview, listview.width / 2, listview.height / 2) // wheel-highlight the rest of the items - var delta = 120 - var prevWheelItem = null + let delta = 120 + let prevWheelItem = null while (!listview.atYEnd) { - var prevContentY = listview.contentY + let prevContentY = listview.contentY mouseWheel(listview, listview.width / 2, listview.height / 2, -delta, -delta) tryCompare(listview, "moving", false) verify(listview.contentY > prevContentY) - var wheelItem = listview.itemAt(listview.width / 2, listview.contentY + listview.height / 2) + let wheelItem = listview.itemAt(listview.width / 2, listview.contentY + listview.height / 2) if (!wheelItem || !wheelItem.visible || wheelItem === prevWheelItem) continue @@ -1513,7 +1513,7 @@ TestCase { } function test_validator() { - var control = createTemporaryObject(comboBox, testCase, {editable: true, validator: regExpValidator}) + let control = createTemporaryObject(comboBox, testCase, {editable: true, validator: regExpValidator}) control.editText = "blu" compare(control.acceptableInput, false) @@ -1557,7 +1557,7 @@ TestCase { } function test_append_find() { - var control = createTemporaryObject(appendFindBox, testCase) + let control = createTemporaryObject(appendFindBox, testCase) compare(control.currentIndex, 0) compare(control.currentText, "first") @@ -1581,15 +1581,15 @@ TestCase { } function test_editable() { - var control = createTemporaryObject(comboBox, testCase, {editable: true, model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]}) + let control = createTemporaryObject(comboBox, testCase, {editable: true, model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]}) verify(control) control.contentItem.forceActiveFocus() verify(control.activeFocus) - var acceptCount = 0 + let acceptCount = 0 - var acceptSpy = signalSpy.createObject(control, {target: control, signalName: "accepted"}) + let acceptSpy = signalSpy.createObject(control, {target: control, signalName: "accepted"}) verify(acceptSpy.valid) compare(control.editText, "Banana") @@ -1732,7 +1732,7 @@ TestCase { } function test_keys_attached() { - var control = createTemporaryObject(keysAttachedBox, testCase) + let control = createTemporaryObject(keysAttachedBox, testCase) verify(control) control.contentItem.forceActiveFocus() @@ -1765,7 +1765,7 @@ TestCase { } function test_minusOneIndexResetsSelection_QTBUG_35794(data) { - var control = createTemporaryObject(comboBox, testCase, {editable: data.editable, model: ["A", "B", "C"]}) + let control = createTemporaryObject(comboBox, testCase, {editable: data.editable, model: ["A", "B", "C"]}) verify(control) compare(control.currentIndex, 0) @@ -1779,7 +1779,7 @@ TestCase { } function test_minusOneToZeroSelection_QTBUG_38036() { - var control = createTemporaryObject(comboBox, testCase, {model: ["A", "B", "C"]}) + let control = createTemporaryObject(comboBox, testCase, {model: ["A", "B", "C"]}) verify(control) compare(control.currentIndex, 0) @@ -1793,7 +1793,7 @@ TestCase { } function test_emptyPopupAfterModelCleared() { - var control = createTemporaryObject(comboBox, testCase, { model: 1 }) + let control = createTemporaryObject(comboBox, testCase, { model: 1 }) verify(control) compare(control.popup.implicitHeight, 0) @@ -1845,17 +1845,17 @@ TestCase { } function test_keyClose(data) { - var container = createTemporaryObject(keysMonitor, testCase) + let container = createTemporaryObject(keysMonitor, testCase) verify(container) - var control = comboBox.createObject(container) + let control = comboBox.createObject(container) verify(control) control.forceActiveFocus() verify(control.activeFocus) - var pressedKeys = 0 - var releasedKeys = 0 + let pressedKeys = 0 + let releasedKeys = 0 // popup not visible -> propagates keyPress(data.key) @@ -1892,18 +1892,18 @@ TestCase { } function test_popupFocus_QTBUG_74661() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) verify(control) - var popup = createTemporaryObject(customPopup, testCase) + let popup = createTemporaryObject(customPopup, testCase) verify(popup) control.popup = popup - var openedSpy = signalSpy.createObject(control, {target: popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: popup, signalName: "opened"}) verify(openedSpy.valid) - var closedSpy = signalSpy.createObject(control, {target: popup, signalName: "closed"}) + let closedSpy = signalSpy.createObject(control, {target: popup, signalName: "closed"}) verify(closedSpy.valid) control.forceActiveFocus() @@ -1932,14 +1932,14 @@ TestCase { } function test_comboBoxWithShaderEffect() { - var control = createTemporaryObject(comboBoxWithShaderEffect, testCase, {model: 9}) + let control = createTemporaryObject(comboBoxWithShaderEffect, testCase, {model: 9}) verify(control) waitForRendering(control) control.forceActiveFocus() - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) + let openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) verify(openedSpy.valid) - var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) + let closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) verify(closedSpy.valid) control.popup.open() @@ -2204,7 +2204,7 @@ TestCase { // QTBUG-61021: text line should not be focused by default // It causes (e.g. on Android) showing virtual keyboard when it is not needed function test_doNotFocusTextLineByDefault() { - var control = createTemporaryObject(comboBox, testCase) + let control = createTemporaryObject(comboBox, testCase) // Focus not set after creating combobox verify(!control.activeFocus) verify(!control.contentItem.focus) @@ -2313,7 +2313,7 @@ TestCase { verify(control) control.forceActiveFocus() - var visibleChangedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "visibleChanged"}) + let visibleChangedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "visibleChanged"}) verify(visibleChangedSpy.valid) // press doesn't open @@ -2360,7 +2360,7 @@ TestCase { control = createTemporaryObject(comboBox, testCase, { model: fruitmodel }); verify(control); - for (var i = 0; i < 3; ++i) + for (let i = 0; i < 3; ++i) ignoreWarning(/ComboBox\.qml\:[0-9]+\:[0-9]+\: Unable to assign QQmlDMAbstractItemModelData to QString/); compare(control.popup.contentItem.itemAtIndex(0).text, ""); }