diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 10:56:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 10:56:53 +0200 |
| commit | a607fcb31e3e1af43bb46ca375ec8378fa0c7d84 (patch) | |
| tree | bf16b32d2596420b47fcfc86b74c7f2ef40ea406 /tests/auto/corelib | |
| parent | 35ec3b49e1b0e7c72643a4e5b835bff57762f8cb (diff) | |
| parent | b4b706d454b785aecbec5cefe46e2a6d7572edbf (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4d123c3cdf86524716ba67091e0347309b49c837
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qtimeline/BLACKLIST | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST index fe1d5bd968..b5b37b4498 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST +++ b/tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST @@ -1,2 +1,3 @@ [deleteChildrenWithRunningGroup] osx-10.12 +osx-10.13 diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST index 958563d15e..5611969b4d 100644 --- a/tests/auto/corelib/tools/qtimeline/BLACKLIST +++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST @@ -6,3 +6,4 @@ osx-10.13 windows [frameRate] osx-10.12 +osx-10.13 |