diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-09-28 16:27:54 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-29 10:34:22 +0000 |
commit | 929e3819a87237f6ef757b6846f471a5ba569a30 (patch) | |
tree | c1207ff780d8896c9fc595dcfa946a523cd65d09 /src/libs/utils/fancymainwindow.cpp | |
parent | 8d6ee2509d60eb5ebc078da538c825cc7ef4c1f0 (diff) |
Qt6: enterEvent now gets passed a QEnterEvent
Add a Utils::EnterEvent for porting.
Task-number: QTCREATORBUG-24098
Change-Id: I2782fe33e41a813b5562676f6dc87d6d53babdd3
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/utils/fancymainwindow.cpp')
-rw-r--r-- | src/libs/utils/fancymainwindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index b271095effb..a18fa48520f 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -26,6 +26,7 @@ #include "fancymainwindow.h" #include "algorithm.h" +#include "porting.h" #include "qtcassert.h" #include "stringutils.h" @@ -74,7 +75,7 @@ public: DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable = false); bool eventFilter(QObject *, QEvent *event) override; - void enterEvent(QEvent *event) override; + void enterEvent(EnterEvent *event) override; void leaveEvent(QEvent *event) override; void handleMouseTimeout(); void handleToplevelChanged(bool floating); @@ -114,7 +115,7 @@ public: QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) override + void enterEvent(EnterEvent *event) override { if (isEnabled()) update(); @@ -193,7 +194,7 @@ public: setProperty("managed_titlebar", 1); } - void enterEvent(QEvent *event) override + void enterEvent(EnterEvent *event) override { setActive(true); QWidget::enterEvent(event); @@ -303,7 +304,7 @@ bool DockWidget::eventFilter(QObject *, QEvent *event) return false; } -void DockWidget::enterEvent(QEvent *event) +void DockWidget::enterEvent(EnterEvent *event) { if (!m_immutable) QApplication::instance()->installEventFilter(this); |