diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 20:07:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 20:07:34 +0100 |
| commit | 6e46d74b4d04fbf21ec7e57418ab5568f786b0e7 (patch) | |
| tree | 8735964204723ad84af7a19b1d2eaca31c7d8f78 /tests/auto/controls/data/tst_combobox.qml | |
| parent | 66cca16867594f27b6d9e44101f1bd34d165c8ac (diff) | |
| parent | 8148e5338de3c8d307f758c9ffcf1f7309fd48bd (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/material/DialogButtonBox.qml
src/imports/controls/universal/DialogButtonBox.qml
Change-Id: I16cbf9912a3526783c21a6f30996f83fce9e02c3
Diffstat (limited to 'tests/auto/controls/data/tst_combobox.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 68fe4c76..1a9040fa 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -1036,15 +1036,13 @@ TestCase { var listview = control.popup.contentItem verify(listview) - waitForRendering(listview) - compare(listview.contentItem.children.length, resetmodel.count + 1) // + highlight item + tryCompare(listview.contentItem.children, "length", resetmodel.count + 1) // + highlight item resetmodel.clear() resetmodel.append({text: "Fourth"}) resetmodel.append({text: "Fifth"}) - waitForRendering(listview) - compare(listview.contentItem.children.length, resetmodel.count + 1) // + highlight item + tryCompare(listview.contentItem.children, "length", resetmodel.count + 1) // + highlight item control.destroy() } |