diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:09 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-29 14:46:15 +0000 |
| commit | 78a69fa05e3b2af6ed640692d81e2b1c355fe525 (patch) | |
| tree | 6f8d9e4900ea413ad7495859323c4945ef5c5897 /tests | |
| parent | e4e8b27f1a10d023a0e5388890e480754a5ab39d (diff) | |
| parent | a4fe2d92099e33da39ad1216063a5869990eeab2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/quickwidgets/qquickwidget/BLACKLIST | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qml/ecmascripttests/BLACKLIST b/tests/auto/qml/ecmascripttests/BLACKLIST deleted file mode 100644 index 1ed255e9e2..0000000000 --- a/tests/auto/qml/ecmascripttests/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -[runInterpreted] -macos ci -[runJitted] -macos diff --git a/tests/auto/quickwidgets/qquickwidget/BLACKLIST b/tests/auto/quickwidgets/qquickwidget/BLACKLIST index 18ea65bb72..095e9ee484 100644 --- a/tests/auto/quickwidgets/qquickwidget/BLACKLIST +++ b/tests/auto/quickwidgets/qquickwidget/BLACKLIST @@ -1,3 +1,5 @@ [tabKey] opensuse-42.3 opensuse-leap +[enterLeave] +macos |