diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-06 01:00:11 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-02-06 08:41:57 +0100 |
| commit | 7d86b35dc6833057cae86d9a70e8f2c598c68db5 (patch) | |
| tree | c5b3e87bd0edef2d74bc16b5aba6cbb6b298cd81 /tests/auto/quick/qquickmousearea | |
| parent | 4975a33ba9aa357ba2bca93e292b1fbcfb34c24e (diff) | |
| parent | 4e15f2135cdbefd9999a17d4e4fff5ea93679fac (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/qml/types/qqmlbind.cpp
src/quick/items/qquicklistview.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: Id6805c13256ad13d5651011e5dd09bba0ec02987
Diffstat (limited to 'tests/auto/quick/qquickmousearea')
| -rw-r--r-- | tests/auto/quick/qquickmousearea/BLACKLIST | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST new file mode 100644 index 0000000000..f2cb00225b --- /dev/null +++ b/tests/auto/quick/qquickmousearea/BLACKLIST @@ -0,0 +1,4 @@ +# QTBUG-78153 +[nestedStopAtBounds] +opensuse-leap + |