diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:57:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:57:48 +0100 |
| commit | 8283bc83857ed8c7d85b61d2dc3b35fa4e96a037 (patch) | |
| tree | 51822ff6eac9bd96693657c8f648fafccb0bd69f /tests/auto/quick | |
| parent | f98e83d66c4315e58f777150e129e25fdaa4312f (diff) | |
| parent | dac71f3d6f6bc4f159f6107c792bc70cfe7c308e (diff) | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I92858e9bcccc45aff3792eeb24920181fbf12b4d
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquickflickable/BLACKLIST | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickflickable/BLACKLIST b/tests/auto/quick/qquickflickable/BLACKLIST index f35397f119..826c024732 100644 --- a/tests/auto/quick/qquickflickable/BLACKLIST +++ b/tests/auto/quick/qquickflickable/BLACKLIST @@ -1,7 +1,8 @@ # QTBUG-36804 osx-10.10 +# QTBUG-26696 [rebound] -osx-10.10 +osx [movingAndFlicking:vertical] osx-10.10 [movingAndFlicking:both] |