diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 27 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 4 |
2 files changed, 19 insertions, 12 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index fc91ba23b3..929b587dfb 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -1926,6 +1926,9 @@ void tst_QApplication::touchEventPropagation() int argc = 1; QApplication app(argc, &argv0, QApplication::GuiServer); + const bool mouseEventSynthesizing = QGuiApplicationPrivate::platformIntegration() + ->styleHint(QPlatformIntegration::SynthesizeMouseFromTouchEvents).toBool(); + QList<QTouchEvent::TouchPoint> pressedTouchPoints; QTouchEvent::TouchPoint press(0); press.setState(Qt::TouchPointPressed); @@ -1963,7 +1966,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!window.seenTouchEvent); - QVERIFY(window.seenMouseEvent); // Since QApplication transforms ignored touch events in mouse events + QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); // QApplication may transform ignored touch events in mouse events window.reset(); window.setAttribute(Qt::WA_AcceptTouchEvents); @@ -1977,7 +1980,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(window.seenTouchEvent); - QVERIFY(window.seenMouseEvent); + QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); window.reset(); window.acceptTouchEvent = true; @@ -2015,9 +2018,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); QVERIFY(!window.seenTouchEvent); - QVERIFY(window.seenMouseEvent); + QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); window.reset(); widget.reset(); @@ -2032,9 +2035,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); QVERIFY(!window.seenTouchEvent); - QVERIFY(window.seenMouseEvent); + QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); window.reset(); widget.reset(); @@ -2049,7 +2052,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); QVERIFY(!window.seenTouchEvent); QVERIFY(!window.seenMouseEvent); @@ -2084,9 +2087,9 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); QVERIFY(window.seenTouchEvent); - QVERIFY(window.seenMouseEvent); + QCOMPARE(window.seenMouseEvent, mouseEventSynthesizing); window.reset(); widget.reset(); @@ -2101,7 +2104,7 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); QVERIFY(window.seenTouchEvent); QVERIFY(!window.seenMouseEvent); @@ -2119,8 +2122,8 @@ void tst_QApplication::touchEventPropagation() touchPointList(releasedTouchPoints)); QCoreApplication::processEvents(); QVERIFY(!widget.seenTouchEvent); - QVERIFY(widget.seenMouseEvent); - QVERIFY(!window.seenTouchEvent); + QCOMPARE(widget.seenMouseEvent, mouseEventSynthesizing); + QCOMPARE(!window.seenTouchEvent, mouseEventSynthesizing); QVERIFY(!window.seenMouseEvent); } } diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 0c35107157..3b45acfa1a 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -9409,6 +9409,10 @@ public: void tst_QWidget::touchEventSynthesizedMouseEvent() { + // Pass if the platform does not want mouse event synhesizing + if (!QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::SynthesizeMouseFromTouchEvents).toBool()) + return; + { // Simple case, we ignore the touch events, we get mouse events instead QTouchDevice *device = new QTouchDevice; |