aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-03-31 15:45:45 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-03-31 15:45:46 +0200
commit92dcf9e69e5ed42471d4e02eb165bc80f550129e (patch)
treefcb56709e15991d40de4ef695ac27831cb062a38 /tests/auto
parent03fa9780fa1ac8bab10f99a59dd3fc2f8f878222 (diff)
parent22b7fd1c0b93f12585858ac5baabba32408749fd (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/quick/qquickwindow/BLACKLIST2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
new file mode 100644
index 0000000000..1201ef12f0
--- /dev/null
+++ b/tests/auto/quick/qquickwindow/BLACKLIST
@@ -0,0 +1,2 @@
+[testWindowVisibilityOrder]
+osx