diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:27:28 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 18:28:27 +0100 |
| commit | 4cbadf699838406d14366ce61deec03cf45113f7 (patch) | |
| tree | b4f22e81025a584aaef93f9a0919d7829bd77de2 /tests/auto/corelib/tools/qtimeline/BLACKLIST | |
| parent | 1bd60749d140d14d152b59eccbda4790c517c54e (diff) | |
| parent | a4ea0d9eacd574a6a96f70b138dcb111e9d11d21 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'tests/auto/corelib/tools/qtimeline/BLACKLIST')
| -rw-r--r-- | tests/auto/corelib/tools/qtimeline/BLACKLIST | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST index 9794b0059f..961147a3cf 100644 --- a/tests/auto/corelib/tools/qtimeline/BLACKLIST +++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST @@ -2,6 +2,5 @@ windows-10 msvc-2015 osx [frameRate] -osx-10.12 -osx-10.13 +macos |