diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2014-12-09 18:52:24 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-02-25 13:31:41 +0000 |
commit | 76922a706f0584ce2aa1a0ca758cf0c6196ea729 (patch) | |
tree | b705f586c876189ca7495d7bd909be032b80f02d /tests/auto/widgets/kernel/qapplication | |
parent | ef22739f47857c185f63f87966df79d377c89577 (diff) |
Decide whether to synthesize mouse events on a per device basis
Currently Qt uses the QPlatformIntegration::StyleHint
SynthesizeMouseFromTouchEvents to check whether to synthesize mouse
events from touch events. But not only platform plugins can produce
touch events, they can be created by e.g. QTest::touchEvent() and in
this case we almost definitely need synthesizing regardless of the
platform.
This commit introduces a QTouchDevice::MouseEmulation capability which
replaces use of the QPlatformIntegration::SynthesizeMouseFromTouchEvents.
So it's possible to pass QTouchDevice without this capability to
QTest::touchEvent() and be sure that mouse events will be synthesized.
Notice that touch pads always emulate mouse events.
As a result we can activate some tests which were disabled for specific
platform configurations by commits 6c1670d8c273819435867c42725c0db0eee597dc
and e9760f1559361c39f269fb89f1ebd01f6ee8378d.
Change-Id: Idc82fa4007a095fc1cb5934979361b0023d2b793
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication')
-rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 2a4e06fe29..7e950b33c1 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -2006,9 +2006,6 @@ void tst_QApplication::touchEventPropagation() int argc = 1; QApplication app(argc, &argv0); - const bool mouseEventSynthesizing = QGuiApplicationPrivate::platformIntegration() - ->styleHint(QPlatformIntegration::SynthesizeMouseFromTouchEvents).toBool(); - QList<QTouchEvent::TouchPoint> pressedTouchPoints; QTouchEvent::TouchPoint press(0); press.setState(Qt::TouchPointPressed); @@ -2047,7 +2044,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!window.seenTouchEvent); - QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); // QApplication may transform ignored touch events in mouse events + QVERIFY(window.seenMouseEvent); // QApplication may transform ignored touch events in mouse events window.reset(); window.setAttribute(Qt::WA_AcceptTouchEvents); @@ -2061,7 +2058,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(window.seenTouchEvent); - QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(window.seenMouseEvent); window.reset(); window.acceptTouchEvent = true; @@ -2100,9 +2097,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(widget.seenMouseEvent); QVERIFY(!window.seenTouchEvent); - QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(window.seenMouseEvent); window.reset(); widget.reset(); @@ -2117,9 +2114,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(widget.seenMouseEvent); QVERIFY(!window.seenTouchEvent); - QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(window.seenMouseEvent); window.reset(); widget.reset(); @@ -2134,7 +2131,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(widget.seenMouseEvent); QVERIFY(!window.seenTouchEvent); QVERIFY(!window.seenMouseEvent); @@ -2169,9 +2166,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(widget.seenMouseEvent); QVERIFY(window.seenTouchEvent); - QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(window.seenMouseEvent); window.reset(); widget.reset(); @@ -2186,13 +2183,13 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QVERIFY(!widget.seenMouseEvent); QVERIFY(window.seenTouchEvent); QVERIFY(!window.seenMouseEvent); window.reset(); widget.reset(); - widget.acceptMouseEvent = true; // it matters, touch events are propagated in parallel to synthesized mouse events + widget.acceptMouseEvent = true; // doesn't matter, touch events are propagated first window.acceptTouchEvent = true; QWindowSystemInterface::handleTouchEvent(window.windowHandle(), 0, @@ -2204,8 +2201,8 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); - QCOMPARE(!window.seenTouchEvent, mouseEventSynthesizing); + QVERIFY(!widget.seenMouseEvent); + QVERIFY(window.seenTouchEvent); QVERIFY(!window.seenMouseEvent); } } |