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/other | |
| 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/other')
| -rw-r--r-- | tests/auto/other/macgui/BLACKLIST | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/other/macgui/BLACKLIST b/tests/auto/other/macgui/BLACKLIST index 2b4bcafe80..2b6a0e2fe8 100644 --- a/tests/auto/other/macgui/BLACKLIST +++ b/tests/auto/other/macgui/BLACKLIST @@ -1,2 +1,3 @@ [nonModalOrder] -osx-10.11 +osx-10.11 ci +osx-10.12 ci |