summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-02 12:04:07 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-05 02:06:26 +0200
commit0f39cfae93ab20e6e190bc02225265d6186149d3 (patch)
treef9ad4555955c29f858425c089b96155b485b9c44 /tests/auto/widgets
parent403b01f86682b9b0b1cd271dbf421da949a2f0ad (diff)
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 <shawn.rutledge@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp2
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index ebf340db2a..34f27dbfcf 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -943,7 +943,7 @@ public:
installEventFilter(this);
}
- void enterEvent(QEvent *event)
+ void enterEvent(QEnterEvent *event)
{
enterCount++;
QWidget::enterEvent(event);
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);