diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:36:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-11 13:37:52 +0200 |
| commit | 4c6032ea69a607f1126e9746f9b16b4bd01b852f (patch) | |
| tree | 2084987690561a4238f968465b8c21d85881d9c9 /tests/auto/quick/qquickwindow | |
| parent | 37da30b83021869b2fd069ea49d72d89b16c2046 (diff) | |
| parent | 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I95914046889022e0ef9bdc17338dc5895c5223fe
Diffstat (limited to 'tests/auto/quick/qquickwindow')
| -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 b2720c2642..157808fdbf 100644 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ b/tests/auto/quick/qquickwindow/BLACKLIST @@ -1,2 +1,4 @@ [requestActivate] osx-10.11 +[attachedProperty] +osx-10.11 |