diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 01:00:50 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-14 09:33:22 +0100 |
| commit | 51311db1b33cc7aabaf5027fa0c82a5921aba888 (patch) | |
| tree | 43be7e39e15510607680a5d9e5c06f21a9188256 /tests/auto/quick/pointerhandlers | |
| parent | 3dc5b937c4e9acf83ee54e870390c22f341c29c8 (diff) | |
| parent | 96cf8a33c3c2fa8a3e010e33c37462e3a703fe3d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquickitemview.cpp
Change-Id: I02191959a5023c4320f5487a7fb3a71f8711195f
Diffstat (limited to 'tests/auto/quick/pointerhandlers')
| -rw-r--r-- | tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST index 20f989fc50..92903955ac 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST +++ b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST @@ -1,5 +1,6 @@ [touchAndDragHandlerOnFlickable] windows gcc +opensuse-leap [touchDragFlickableBehindSlider] windows gcc [touchDragFlickableBehindButton] |