diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 12:20:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 12:20:11 +0100 |
| commit | d47ce931797cde751a7df9802acc9917e54ff694 (patch) | |
| tree | 2ebc7b52b4de95811283edb91831d25df67692a1 /tests | |
| parent | 3e7b02e1501599fb69a7c79e44bd59365679d0e9 (diff) | |
| parent | c1dd5c2979e1558427536fe2435ff3892afe3e6f (diff) | |
| download | qtlocation-d47ce931797cde751a7df9802acc9917e54ff694.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: I21ae20734645fc34b302409163f7400015d8302c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_core/BLACKLIST | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative_core/BLACKLIST b/tests/auto/declarative_core/BLACKLIST new file mode 100644 index 00000000..99b4d786 --- /dev/null +++ b/tests/auto/declarative_core/BLACKLIST @@ -0,0 +1,6 @@ +# QTBUG-59074 flaky test +[CoordinateAnimation::test_west_direction_coordinate_animation] +osx +# QTBUG-59074 flaky test +[CoordinateAnimation::test_east_direction_coordinate_animation] +osx |