diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
| commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
| tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /tests/auto/qmltest | |
| parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
| parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/listview/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/qmltest/textedit/BLACKLIST | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qmltest/listview/BLACKLIST b/tests/auto/qmltest/listview/BLACKLIST index 083e2f8978..ffb4f94e2c 100644 --- a/tests/auto/qmltest/listview/BLACKLIST +++ b/tests/auto/qmltest/listview/BLACKLIST @@ -1,4 +1,4 @@ # Blacklist for testing [ListView::test_listInteractiveCurrentIndexEnforce] linux -macos-10.12 +osx-10.12 diff --git a/tests/auto/qmltest/textedit/BLACKLIST b/tests/auto/qmltest/textedit/BLACKLIST index 08a86c1b89..e06cba3e8f 100644 --- a/tests/auto/qmltest/textedit/BLACKLIST +++ b/tests/auto/qmltest/textedit/BLACKLIST @@ -1,6 +1,6 @@ # Blacklist for testing [TextEdit::test_textentry] -macos-10.12 +osx-10.12 [TextEdit::test_textentry_char] -macos-10.12 +osx-10.12 |