diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 14:31:35 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 12:57:54 +0000 |
| commit | 41d0240c8c203fe701efbddc00d0a05254a8a2c4 (patch) | |
| tree | 55b9edad50aac54b54aebd541f535d827bcb1e2f /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | |
| parent | 003e24d72a9647e2dc397906234059fee19103ec (diff) | |
| parent | 1b0c9b46ce13b0f9c533f18fb420ff10ad56e4f6 (diff) | |
Merge branch 'wip/pointerhandler' into dev
Change-Id: Ifae425744d69779a661c7465d33163a7d53fb8a4
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index ef6e444580..0bb913d104 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -63,7 +63,13 @@ public: , touchReleases(0) , ungrabs(0) , m_active(false) - { } + { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + setAcceptTouchEvents(true); +#else + setAcceptedMouseButtons(Qt::LeftButton); // not really, but we want touch events +#endif + } QPointF pos() const { return m_pos; } |