summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Spoerl <axel.spoerl@qt.io>2022-09-20 11:17:28 +0200
committerAxel Spoerl <axel.spoerl@qt.io>2022-09-20 19:47:34 +0200
commitfeed452a9987a4629b03d3bc4a629ba7978ab7ba (patch)
tree103b2e95ba9e1983e06b489b266ea364ecb748b6
parent89d58147ea7bad7f822681abf841e4f601cb0601 (diff)
Make commit() call in QTouchEventWidgetSequence explicit
Calling commit() in the QTouchEventWidgetSequence destructor bypasses the vtable. This causes a compiler warning. This patch eliminates the warning by explicitly calling QTouchEventWidgetSequence::commit(). Pick-to: 6.4 Change-Id: I1354aa22d2a85a609adc307338d118c5789df93f Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r--src/gui/kernel/qtestsupport_gui.cpp2
-rw-r--r--src/widgets/kernel/qtestsupport_widgets.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp
index c796e0f8a3..9783e873d2 100644
--- a/src/gui/kernel/qtestsupport_gui.cpp
+++ b/src/gui/kernel/qtestsupport_gui.cpp
@@ -62,7 +62,7 @@ namespace QTest {
QTouchEventSequence::~QTouchEventSequence()
{
if (commitWhenDestroyed)
- commit();
+ QTouchEventSequence::commit();
}
QTouchEventSequence& QTouchEventSequence::press(int touchId, const QPoint &pt, QWindow *window)
{
diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp
index ff57def8ee..4aee48d00d 100644
--- a/src/widgets/kernel/qtestsupport_widgets.cpp
+++ b/src/widgets/kernel/qtestsupport_widgets.cpp
@@ -83,7 +83,7 @@ namespace QTest {
QTouchEventWidgetSequence::~QTouchEventWidgetSequence()
{
if (commitWhenDestroyed)
- commit();
+ QTouchEventWidgetSequence::commit();
}
QTouchEventWidgetSequence& QTouchEventWidgetSequence::press(int touchId, const QPoint &pt, QWidget *widget)