aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quickcontrols2/controls
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quickcontrols2/controls')
-rw-r--r--tests/auto/quickcontrols2/controls/basic/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/data/tst_combobox.qml9
-rw-r--r--tests/auto/quickcontrols2/controls/fusion/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/imagine/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/ios/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/macos/BLACKLIST2
-rw-r--r--tests/auto/quickcontrols2/controls/material/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/universal/BLACKLIST3
-rw-r--r--tests/auto/quickcontrols2/controls/windows/BLACKLIST3
9 files changed, 25 insertions, 7 deletions
diff --git a/tests/auto/quickcontrols2/controls/basic/BLACKLIST b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
index bdb2af0b46..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
@@ -8,3 +8,6 @@
[RangeSlider::test_overlappingHandles]
b2qt
qnx
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
index 0e896ddb2d..6de1c81595 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
@@ -1870,8 +1870,8 @@ TestCase {
width: 200
height: 200
- Keys.onPressed: { ++pressedKeys; lastPressedKey = event.key }
- Keys.onReleased: { ++releasedKeys; lastReleasedKey = event.key }
+ Keys.onPressed: (event) => { ++pressedKeys; lastPressedKey = event.key }
+ Keys.onReleased: (event) => { ++releasedKeys; lastReleasedKey = event.key }
ComboBox {
id: comboBox
@@ -1918,11 +1918,6 @@ TestCase {
compare(container.pressedKeys, pressedKeys)
keyRelease(data.key)
- // Popup receives the key release event if it has an exit transition, but
- // not if it has been immediately closed on press, without a transition.
- // ### TODO: Should Popup somehow always block the key release event?
- if (!control.popup.exit)
- ++releasedKeys
compare(container.releasedKeys, releasedKeys)
tryCompare(control.popup, "visible", false)
diff --git a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
index bdb2af0b46..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
@@ -8,3 +8,6 @@
[RangeSlider::test_overlappingHandles]
b2qt
qnx
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
index 72eebcd21d..c3865e0006 100644
--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
@@ -12,3 +12,6 @@ qnx
# QTBUG-101704
[ToolTip::test_attachedSizeBug]
*
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/ios/BLACKLIST b/tests/auto/quickcontrols2/controls/ios/BLACKLIST
index 68b52a8ccc..e5d8e9bcab 100644
--- a/tests/auto/quickcontrols2/controls/ios/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/ios/BLACKLIST
@@ -2,3 +2,6 @@
[ScrollView::test_textArea]
*
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/macos/BLACKLIST b/tests/auto/quickcontrols2/controls/macos/BLACKLIST
index 0e48b148d8..1e751af957 100644
--- a/tests/auto/quickcontrols2/controls/macos/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/macos/BLACKLIST
@@ -1,2 +1,4 @@
# See qtbase/src/testlib/qtestblacklist.cpp for format
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/material/BLACKLIST b/tests/auto/quickcontrols2/controls/material/BLACKLIST
index bdb2af0b46..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
@@ -8,3 +8,6 @@
[RangeSlider::test_overlappingHandles]
b2qt
qnx
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/universal/BLACKLIST b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
index bdb2af0b46..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
@@ -8,3 +8,6 @@
[RangeSlider::test_overlappingHandles]
b2qt
qnx
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817
diff --git a/tests/auto/quickcontrols2/controls/windows/BLACKLIST b/tests/auto/quickcontrols2/controls/windows/BLACKLIST
index 476340700a..8230d5eb4e 100644
--- a/tests/auto/quickcontrols2/controls/windows/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/windows/BLACKLIST
@@ -3,3 +3,6 @@
# QTBUG-70597
[Tumbler::test_itemsCorrectlyPositioned]
*
+
+[ComboBox::test_keyClose]
+macos arm ci # QTBUG-102817