diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-08-07 12:50:28 +0200 |
commit | 05b90be3c5ce4709156178478abb2e7ba125a0be (patch) | |
tree | a7c39b76c99f4887dbc6837be3a41afc7fdb29b4 /tests/auto/corelib/tools/qtimeline/BLACKLIST | |
parent | 7301e44161d8bb25410219a31405584c9492b83e (diff) | |
parent | 6f357f50b4b72e3c5a6903a09624ade1d72d12c1 (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'tests/auto/corelib/tools/qtimeline/BLACKLIST')
-rw-r--r-- | tests/auto/corelib/tools/qtimeline/BLACKLIST | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST index 5611969b4d..b60cab31fa 100644 --- a/tests/auto/corelib/tools/qtimeline/BLACKLIST +++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST @@ -1,9 +1,9 @@ [interpolation] -windows osx-10.12 +windows-10 msvc-2015 osx-10.13 -[duration] -windows +windows-7sp1 [frameRate] osx-10.12 osx-10.13 + |