summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 01:00:09 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2020-01-28 16:02:04 +0100
commit6c3eb39832876a65291546476b92fd94950b1208 (patch)
tree2d551aab7fce80b2ef603f1cfc42bf6f9d0e4411 /tests/auto/gui/kernel
parentfcd3a20059d0c629d972ba2577694394b438a100 (diff)
parent082faeff9c4c5a5b10d140b391d30305575a898b (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r--tests/auto/gui/kernel/qwindow/BLACKLIST4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST
index 27463adf99..44a55316ab 100644
--- a/tests/auto/gui/kernel/qwindow/BLACKLIST
+++ b/tests/auto/gui/kernel/qwindow/BLACKLIST
@@ -2,10 +2,10 @@
opensuse-leap
[positioning:default]
linux
-osx-10.12 ci
+macos ci
winrt
[positioning:fake]
-osx-10.12 ci
+macos ci
[modalWithChildWindow]
# QTBUG-66851
# QTBUG-69160