From 8ce979557c6048659d2baba587cf9369324b5a24 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 30 Aug 2021 16:13:06 +0200 Subject: [PATCH] tst_combobox: skip indicator check for the native styles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ComboBox::test_defaults() test checks that there is an indictor present in the style. But for the native styles, the indicator is drawn as a part of the background. So skip the failing test when running on mac and windows. Task-number: QTBUG-95678 Pick-to: 6.2 Change-Id: I35f1900044bad1a519d9883b2061810bff8eb7a8 Reviewed-by: Mitch Curtis Reviewed-by: Jan Arve Sæther --- tests/auto/quickcontrols2/controls/data/tst_combobox.qml | 6 +++++- tests/auto/quickcontrols2/controls/macos/BLACKLIST | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml index 5359f63c4a..71f4f71174 100644 --- a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml +++ b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml @@ -155,7 +155,11 @@ TestCase { compare(control.highlightedIndex, -1) compare(control.currentText, "") verify(control.delegate) - verify(control.indicator) + if (Qt.platform.pluginName !== "cocoa" && Qt.platform.pluginName !== "windows") { + // Only the non-native styles sets an indicator delegate. The native + // styles will instead draw the indicator as a part of the background. + verify(control.indicator) + } verify(control.popup) verify(control.acceptableInput) compare(control.inputMethodHints, Qt.ImhNoPredictiveText) diff --git a/tests/auto/quickcontrols2/controls/macos/BLACKLIST b/tests/auto/quickcontrols2/controls/macos/BLACKLIST index 8ea01a3584..95bc58171b 100644 --- a/tests/auto/quickcontrols2/controls/macos/BLACKLIST +++ b/tests/auto/quickcontrols2/controls/macos/BLACKLIST @@ -3,8 +3,6 @@ # QTBUG-95678 # Blacklisted in order to get the native macOS style under # regression control -[ComboBox::test_defaults] -* [ComboBox::test_font] * [ComboBox::test_implicitContentWidthPolicy_WidestText]