diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:49:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 09:34:11 +0100 |
| commit | 2570b801c74832a3c83a8b56ad0f76812969e190 (patch) | |
| tree | c4bd64d8e6b15b507f51f550ba13a0c062528d65 /tests/auto/quick/touchmouse | |
| parent | 1b96186d1418adcba85fdbfd794da2d2f6ea122d (diff) | |
| parent | 706a6647db695cdeb854ef1bf956ded56b498f78 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4compileddata_p.h
src/qml/debugger/qqmlprofiler_p.h
src/qml/jsruntime/qv4engine.cpp
src/qml/memory/qv4mm.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlobjectcreator.cpp
src/qml/qml/qqmlobjectcreator_p.h
src/qml/types/qqmldelegatemodel.cpp
src/quick/items/qquickitem_p.h
src/quick/items/qquickwindow.cpp
tests/auto/quick/touchmouse/BLACKLIST
tests/benchmarks/qml/holistic/tst_holistic.cpp
Change-Id: I520f349ab4b048dd337d9647113564fc257865c2
Diffstat (limited to 'tests/auto/quick/touchmouse')
| -rw-r--r-- | tests/auto/quick/touchmouse/BLACKLIST | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/touchmouse/BLACKLIST b/tests/auto/quick/touchmouse/BLACKLIST index ac0352d10b..e0d4bff131 100644 --- a/tests/auto/quick/touchmouse/BLACKLIST +++ b/tests/auto/quick/touchmouse/BLACKLIST @@ -1,3 +1,5 @@ # QTBUG-40856 hover regression on pointerhandler branch: TODO fix before merging to dev [hoverEnabled] * +[buttonOnDelayedPressFlickable] +windows gcc developer-build |