diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
| commit | 4b72f48637a87c95deedcc501cd9cc8f717117fa (patch) | |
| tree | 80f00ade2cc3f3845e0f309f39a2649040d203e3 /tests/auto/quick/qquickwindow/BLACKLIST | |
| parent | 3d30c6d7b40ce86f49bc7bdc5c2c74ce180bb3dd (diff) | |
| parent | f7e1f7b2f1f1577fd94dfffb93ef15ded5d09031 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/BLACKLIST
Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5
Diffstat (limited to 'tests/auto/quick/qquickwindow/BLACKLIST')
| -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 index 331f736013..8a19a679a3 100644 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ b/tests/auto/quick/qquickwindow/BLACKLIST @@ -1,2 +1,4 @@ [cursor] * +[testWindowVisibilityOrder] +osx |