diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp index f8c4631f05..0a461a6396 100644 --- a/src/gui/kernel/qtestsupport_gui.cpp +++ b/src/gui/kernel/qtestsupport_gui.cpp @@ -92,17 +92,19 @@ QTouchEventSequence& QTouchEventSequence::stationary(int touchId) return *this; } -void QTouchEventSequence::commit(bool processEvents) +bool QTouchEventSequence::commit(bool processEvents) { if (points.isEmpty()) - return; + return false; QThread::msleep(1); + bool ret = false; if (targetWindow) - qt_handleTouchEvent(targetWindow, device, points.values()); + ret = qt_handleTouchEvent(targetWindow, device, points.values()); if (processEvents) QCoreApplication::processEvents(); previousPoints = points; points.clear(); + return ret; } QTouchEventSequence::QTouchEventSequence(QWindow *window, QPointingDevice *aDevice, bool autoCommit) diff --git a/src/gui/kernel/qtestsupport_gui.h b/src/gui/kernel/qtestsupport_gui.h index 2a756034ba..1bf81f1888 100644 --- a/src/gui/kernel/qtestsupport_gui.h +++ b/src/gui/kernel/qtestsupport_gui.h @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE class QWindow; -Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *w, const QPointingDevice *device, +Q_GUI_EXPORT bool qt_handleTouchEvent(QWindow *w, const QPointingDevice *device, const QList &points, Qt::KeyboardModifiers mods = Qt::NoModifier); @@ -33,7 +33,7 @@ public: QTouchEventSequence& release(int touchId, const QPoint &pt, QWindow *window = nullptr); virtual QTouchEventSequence& stationary(int touchId); - virtual void commit(bool processEvents = true); + virtual bool commit(bool processEvents = true); protected: QTouchEventSequence(QWindow *window, QPointingDevice *aDevice, bool autoCommit); diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index ef43e50c61..3831d202f3 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -1203,11 +1203,11 @@ namespace QTest } } -Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *window, const QPointingDevice *device, +Q_GUI_EXPORT bool qt_handleTouchEvent(QWindow *window, const QPointingDevice *device, const QList &points, Qt::KeyboardModifiers mods = Qt::NoModifier) { - QWindowSystemInterface::handleTouchEvent(window, device, + return QWindowSystemInterface::handleTouchEvent(window, device, QWindowSystemInterfacePrivate::toNativeTouchPoints(points, window), mods); } diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index fef6b6255c..2c46453968 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -1640,15 +1640,21 @@ */ /*! - \fn void QTest::QTouchEventSequence::commit(bool processEvents) + \fn bool QTest::QTouchEventSequence::commit(bool processEvents) - Commits this sequence of touch events to the event system. Normally there is no need to call this - function because it is called from the destructor. However, if autoCommit is disabled, the events - only get committed upon explicitly calling this function. + Commits this touch event to the event system, and returns whether it was + accepted after delivery. - In special cases tests may want to disable the processing of the events. This can be achieved by - setting \a processEvents to false. This results in merely queuing the events, the event loop will - not be forced to process them. + Normally there is no need to call this function because it is called from + the destructor. However, if autoCommit is disabled, the events only get + committed upon explicitly calling this function. Another reason to call it + explicitly is to check the return value. + + In special cases, tests may want to disable the processing of the event. + This can be achieved by setting \a processEvents to false. This results in + merely queuing the event: the event loop will not be forced to process it. + + Returns whether the event was accepted after delivery. */ /*! diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp index 490a40d431..ea8317db03 100644 --- a/src/widgets/kernel/qtestsupport_widgets.cpp +++ b/src/widgets/kernel/qtestsupport_widgets.cpp @@ -115,20 +115,22 @@ QTouchEventWidgetSequence& QTouchEventWidgetSequence::stationary(int touchId) return *this; } -void QTouchEventWidgetSequence::commit(bool processEvents) +bool QTouchEventWidgetSequence::commit(bool processEvents) { + bool ret = false; if (points.isEmpty()) - return; + return ret; QThread::msleep(1); if (targetWindow) { - qt_handleTouchEvent(targetWindow, device, points.values()); + ret = qt_handleTouchEvent(targetWindow, device, points.values()); } else if (targetWidget) { - qt_handleTouchEvent(targetWidget->windowHandle(), device, points.values()); + ret = qt_handleTouchEvent(targetWidget->windowHandle(), device, points.values()); } if (processEvents) QCoreApplication::processEvents(); previousPoints = points; points.clear(); + return ret; } QTest::QTouchEventWidgetSequence::QTouchEventWidgetSequence(QWidget *widget, QPointingDevice *aDevice, bool autoCommit) diff --git a/src/widgets/kernel/qtestsupport_widgets.h b/src/widgets/kernel/qtestsupport_widgets.h index 54784b25e1..84b529ae31 100644 --- a/src/widgets/kernel/qtestsupport_widgets.h +++ b/src/widgets/kernel/qtestsupport_widgets.h @@ -26,7 +26,7 @@ public: QTouchEventWidgetSequence& release(int touchId, const QPoint &pt, QWidget *widget = nullptr); QTouchEventWidgetSequence& stationary(int touchId) override; - void commit(bool processEvents = true) override; + bool commit(bool processEvents = true) override; private: QTouchEventWidgetSequence(QWidget *widget, QPointingDevice *aDevice, bool autoCommit);