diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-02 12:04:07 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-05 02:06:26 +0200 |
commit | 0f39cfae93ab20e6e190bc02225265d6186149d3 (patch) | |
tree | f9ad4555955c29f858425c089b96155b485b9c44 /src/widgets/dialogs | |
parent | 403b01f86682b9b0b1cd271dbf421da949a2f0ad (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 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qwizard_win.cpp | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard_win_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index c80db1fd94..9575dc7fba 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -94,7 +94,7 @@ QSize QVistaBackButton::sizeHint() const return QSize(width, height); } -void QVistaBackButton::enterEvent(QEvent *event) +void QVistaBackButton::enterEvent(QEnterEvent *event) { if (isEnabled()) update(); diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index 520046ca02..a8799e4b86 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -75,7 +75,7 @@ public: inline QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) override; + void enterEvent(QEnterEvent *event) override; void leaveEvent(QEvent *event) override; void paintEvent(QPaintEvent *event) override; }; |