From 0f39cfae93ab20e6e190bc02225265d6186149d3 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 2 Sep 2020 12:04:07 +0200 Subject: Change QWidget::enterEvent signature to take a QEnterEvent This is a source incompatible change for widget implementors. Leaving the old enterEvent as a virtual overload is problematic due to shadowing. Best to make a clean cut, widget reimplementors will get a compile time warning if they mark their override as such, or if they try to call the parent class implementation. Addresses ### Qt 6 comment. [ChangeLog][QtWidgets][QWidget] The virtual enterEvent handler now receives a QEnterEvent, which contains information about mouse position and button states, rather than a plain QEvent. Change-Id: I233f594fd79c0c090983b3db8532913d00132fde Reviewed-by: Shawn Rutledge Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp') diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index ae91685697..d670f19d0e 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -5596,7 +5596,7 @@ public: r = QRegion(); } - void enterEvent(QEvent *) override { ++enters; } + void enterEvent(QEnterEvent *) override { ++enters; } void leaveEvent(QEvent *) override { ++leaves; } void resetCounts() @@ -9627,7 +9627,7 @@ void tst_QWidget::syntheticEnterLeave() { public: using QWidget::QWidget; - void enterEvent(QEvent *) override { ++numEnterEvents; } + void enterEvent(QEnterEvent *) override { ++numEnterEvents; } void leaveEvent(QEvent *) override { ++numLeaveEvents; } int numEnterEvents = 0; int numLeaveEvents = 0; @@ -9742,7 +9742,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() { public: using QWidget::QWidget; - void enterEvent(QEvent *) override { ++numEnterEvents; } + void enterEvent(QEnterEvent *) override { ++numEnterEvents; } void mouseMoveEvent(QMouseEvent *event) override { QCOMPARE(event->button(), Qt::NoButton); -- cgit v1.2.3