diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
| commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
| tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /tests/auto/gui/kernel/qwindow | |
| parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
| parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'tests/auto/gui/kernel/qwindow')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 19d9262bca..1443359377 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -1,6 +1,9 @@ [positioning:default] ubuntu-14.04 ubuntu-16.04 +osx-10.12 ci +[positioning:fake] +osx-10.12 ci [modalWindowPosition] ubuntu-14.04 ubuntu-16.04 |