diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:09 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 08:09:51 +0100 |
| commit | 082faeff9c4c5a5b10d140b391d30305575a898b (patch) | |
| tree | 505d176f243bfa3785a8aeb13138d3eba476175b /tests/auto/widgets/util | |
| parent | be8c257da9a264994243c120231965ff0008ef09 (diff) | |
| parent | 1ed802e3b8a7f236bd277719090f461a87eae78e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/image/qpnghandler.cpp
Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301
Diffstat (limited to 'tests/auto/widgets/util')
| -rw-r--r-- | tests/auto/widgets/util/qscroller/BLACKLIST | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/widgets/util/qscroller/BLACKLIST b/tests/auto/widgets/util/qscroller/BLACKLIST new file mode 100644 index 0000000000..347ab6440b --- /dev/null +++ b/tests/auto/widgets/util/qscroller/BLACKLIST @@ -0,0 +1,5 @@ +[scrollTo] +macos + +[scroll] +macos |