diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
| commit | 65faf4565595d91996ddec4af25af5e97c7f0317 (patch) | |
| tree | a7415e90db3fa1e46f638e1c31d2f2b9a5d0ec4a /tests/auto/corelib/animation | |
| parent | a9383ef99a29c333a1edd32695ddc29ea0ba805d (diff) | |
| parent | 26bc4ac5cb56ce8f2d3d10125fa9c6a72140573a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/platforms/eglfs/eglfs-plugin.pro
Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db
Diffstat (limited to 'tests/auto/corelib/animation')
| -rw-r--r-- | tests/auto/corelib/animation/qpauseanimation/BLACKLIST | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/animation/qpauseanimation/BLACKLIST b/tests/auto/corelib/animation/qpauseanimation/BLACKLIST index 3b2cd84749..8fc1b07502 100644 --- a/tests/auto/corelib/animation/qpauseanimation/BLACKLIST +++ b/tests/auto/corelib/animation/qpauseanimation/BLACKLIST @@ -2,3 +2,5 @@ osx-10.9 [pauseAndPropertyAnimations] * +[multipleSequentialGroups] +osx |