diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 14:48:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-07 12:53:23 +0000 |
| commit | 017350a8a9b4ac866c9b79186bf5a1dd6f6f06ec (patch) | |
| tree | f98070d9bf0bd5659d34355b5eb9647637874187 /tests/auto/qmltest | |
| parent | b361a59c699fca02379c149cf0b9c59490a1ba62 (diff) | |
| parent | 67d1d7843ab5e1c904c8f0f76eadb9fc3f1bbb17 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/jit/qv4assembler.cpp
src/qml/jit/qv4assembler_p.h
src/qml/jit/qv4isel_masm.cpp
src/qml/jsruntime/qv4vme_moth.cpp
Change-Id: I865d794e550a263387a39ca8d051ebf48b70cbc0
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/BLACKLIST | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qmltest/BLACKLIST b/tests/auto/qmltest/BLACKLIST index d324e9da5d..e0a4ce1743 100644 --- a/tests/auto/qmltest/BLACKLIST +++ b/tests/auto/qmltest/BLACKLIST @@ -10,3 +10,7 @@ linux [ListView::test_listInteractiveCurrentIndexEnforce] linux macos-10.12 +[TextEdit::test_textentry] +macos-10.12 +[TextEdit::test_textentry_char] +macos-10.12 |