diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-09 07:14:23 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-08-09 07:14:23 +0000 |
| commit | bf0368f9af60278f5216dabed3cf9a2bf0e1233b (patch) | |
| tree | 7115045c3e3b915564d7c25d27502ec6f48db926 /tests/auto/quick/qquickitem/tst_qquickitem.cpp | |
| parent | 0047b3bdc0938077d7049f4103f835b52897b93a (diff) | |
| parent | 41d0240c8c203fe701efbddc00d0a05254a8a2c4 (diff) | |
Merge "Merge branch 'wip/pointerhandler' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/quick/qquickitem/tst_qquickitem.cpp')
| -rw-r--r-- | tests/auto/quick/qquickitem/tst_qquickitem.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index 10a3a0bfa8..f4434d9d3f 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -49,7 +49,12 @@ public: : QQuickItem(parent), focused(false), pressCount(0), releaseCount(0) , wheelCount(0), acceptIncomingTouchEvents(true) , touchEventReached(false), timestamp(0) - , lastWheelEventPos(0, 0), lastWheelEventGlobalPos(0, 0) {} + , lastWheelEventPos(0, 0), lastWheelEventGlobalPos(0, 0) + { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + setAcceptTouchEvents(true); +#endif + } bool focused; int pressCount; |