diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:27:28 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:27:28 +0100 |
| commit | a4ea0d9eacd574a6a96f70b138dcb111e9d11d21 (patch) | |
| tree | 3c6439e1c9007e20bb0e8665cdba36c675b4a78f /tests/auto/other | |
| parent | ef442327b8a4122fe46462e95a0537ec5ac53cb6 (diff) | |
| parent | 6c3eb39832876a65291546476b92fd94950b1208 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia5727ce68001bcaab467f5fae3a4933d1217015f
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/macnativeevents/BLACKLIST | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST index 2922e22d9f..b0a6551587 100644 --- a/tests/auto/other/macnativeevents/BLACKLIST +++ b/tests/auto/other/macnativeevents/BLACKLIST @@ -19,7 +19,7 @@ osx osx [testMouseDragToNonClientArea] osx -osx-10.12 ci +macos ci # The following key tests fail after switching to synchronous # expose events, and we don't know why yet. QTBUG-62042 [testKeyPressOnToplevel] @@ -32,8 +32,8 @@ osx osx # QTQAINFRA-1292 [testPushButtonPressRelease] -osx-10.12 ci +macos ci # QTQAINFRA-1292 [testModifierCtrlWithDontSwapCtrlAndMeta] -osx-10.12 ci +macos ci |