diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 15:45:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 15:45:46 +0200 |
commit | 92dcf9e69e5ed42471d4e02eb165bc80f550129e (patch) | |
tree | fcb56709e15991d40de4ef695ac27831cb062a38 /tests/auto | |
parent | 03fa9780fa1ac8bab10f99a59dd3fc2f8f878222 (diff) | |
parent | 22b7fd1c0b93f12585858ac5baabba32408749fd (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/quick/qquickwindow/BLACKLIST | 2 |
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 |