diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-15 11:44:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-12-15 11:44:26 +0100 |
| commit | 1fcec5bf1e208a4f32ef4f3afa54684358a11a1d (patch) | |
| tree | febc62851b20cfc485f875e3a6303ac2791b1119 /tests/auto/controls/data/tst_combobox.qml | |
| parent | 6767d789b3544c6ff7717250e1c0dee02ad91fd4 (diff) | |
| parent | 6b89293b99e763589181fd1f75470712f52cee3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
src/imports/controls/ComboBox.qml
src/quicktemplates2/qquickabstractbutton.cpp
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickapplicationwindow_p.h
src/quicktemplates2/qquickcombobox.cpp
src/quicktemplates2/qquickcontainer.cpp
src/quicktemplates2/qquickcontrol.cpp
src/quicktemplates2/qquickcontrol_p.h
src/quicktemplates2/qquickcontrol_p_p.h
src/quicktemplates2/qquicklabel_p.h
src/quicktemplates2/qquicklabel_p_p.h
src/quicktemplates2/qquickslider_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p.h
src/quicktemplates2/qquicktextfield_p_p.h
tests/auto/auto.pro
tests/auto/controls/data/tst_combobox.qml
Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
Diffstat (limited to 'tests/auto/controls/data/tst_combobox.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 7bc78896..5389a04a 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -1169,7 +1169,7 @@ TestCase { function test_mouseHighlight() { if ((Qt.platform.pluginName === "offscreen") - || (Qt.platform.pluginName === "minimal")) + || (Qt.platform.pluginName === "minimal")) skip("Mouse highlight not functional on offscreen/minimal platforms") var control = createTemporaryObject(comboBox, testCase, {model: 20}) verify(control) @@ -1508,7 +1508,6 @@ TestCase { var control = createTemporaryObject(comboBox, testCase, { model: 1 }) verify(control) compare(control.popup.implicitHeight, 0) - compare(control.popup.height, control.popup.topPadding + control.popup.bottomPadding) // Ensure that it's open so that the popup's implicitHeight changes when we increase the model count. control.popup.open() |