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>

src/libs/qmleditorwidgets/contextpanewidget.cpp

@@ -149,7 +149,7 @@ void DragWidget::leaveEvent(QEvent *)
         unsetCursor();
 }
 
-void DragWidget::enterEvent(QEvent *)
+void DragWidget::enterEvent(EnterEvent *)
 {
     if (HostOsInfo::isMacHost())
         setCursor(Qt::ArrowCursor);

src/libs/qmleditorwidgets/contextpanewidget.h

@@ -26,6 +26,9 @@
 #pragma once
 
 #include "qmleditorwidgets_global.h"
+
+#include <utils/porting.h>
+
 #include <QFrame>
 #include <QPointer>
 
@@ -62,7 +65,7 @@ protected:
     void mouseMoveEvent(QMouseEvent * event) override;
     void virtual protectedMoved();
     void leaveEvent(QEvent *) override;
-    void enterEvent(QEvent *) override;
+    void enterEvent(Utils::EnterEvent *) override;
 
 private:
     QGraphicsDropShadowEffect *m_dropShadowEffect;

src/libs/qmleditorwidgets/customcolordialog.cpp

@@ -186,7 +186,7 @@ void CustomColorDialog::leaveEvent(QEvent *)
         unsetCursor();
 }
 
-void CustomColorDialog::enterEvent(QEvent *)
+void CustomColorDialog::enterEvent(EnterEvent *)
 {
     if (HostOsInfo::isMacHost())
         setCursor(Qt::ArrowCursor);

src/libs/qmleditorwidgets/customcolordialog.h

@@ -26,6 +26,9 @@
 #pragma once
 
 #include "qmleditorwidgets_global.h"
+
+#include <utils/porting.h>
+
 #include <QFrame>
 
 QT_BEGIN_NAMESPACE
@@ -83,7 +86,7 @@ signals:
 protected:
     void setupWidgets();
     void leaveEvent(QEvent *) override;
-    void enterEvent(QEvent *) override;
+    void enterEvent(Utils::EnterEvent *) override;
 
 private:
     QFrame *m_beforeColorWidget;

src/libs/utils/detailswidget.cpp

@@ -292,7 +292,7 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
     }
 }
 
-void DetailsWidget::enterEvent(QEvent * event)
+void DetailsWidget::enterEvent(EnterEvent *event)
 {
     QWidget::enterEvent(event);
     d->changeHoverState(true);

src/libs/utils/detailswidget.h

@@ -27,6 +27,8 @@
 
 #include "utils_global.h"
 
+#include "porting.h"
+
 #include <QWidget>
 
 namespace Utils {
@@ -94,7 +96,7 @@ private:
 
 protected:
     void paintEvent(QPaintEvent *paintEvent) override;
-    void enterEvent(QEvent *event) override;
+    void enterEvent(EnterEvent *event) override;
     void leaveEvent(QEvent *event) override;
 
 private:

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);

src/libs/utils/porting.h

@@ -27,6 +27,9 @@
 
 #include "utils_global.h"
 
+#ifdef QT_GUI_LIB
+#include <QEnterEvent>
+#endif
 #include <QString>
 
 namespace Utils {
@@ -84,4 +87,12 @@ inline QStringView midView(const QString &s, int offset, int length)
 }
 #endif
 
+#ifdef QT_GUI_LIB
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+using EnterEvent = QEvent;
+#else
+using EnterEvent = QEnterEvent;
+#endif
+#endif
+
 } // namespace Utils

src/plugins/coreplugin/fancytabwidget.cpp

@@ -164,7 +164,7 @@ bool FancyTabBar::event(QEvent *event)
 }
 
 // Resets hover animation on mouse enter
-void FancyTabBar::enterEvent(QEvent *event)
+void FancyTabBar::enterEvent(EnterEvent *event)
 {
     Q_UNUSED(event)
     m_hoverRect = QRect();

src/plugins/coreplugin/fancytabwidget.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include <utils/infobar.h>
+#include <utils/porting.h>
 
 #include <QIcon>
 #include <QWidget>
@@ -87,7 +88,7 @@ public:
     void paintTab(QPainter *painter, int tabIndex) const;
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
-    void enterEvent(QEvent *event) override;
+    void enterEvent(Utils::EnterEvent *event) override;
     void leaveEvent(QEvent *event) override;
     bool validIndex(int index) const { return index >= 0 && index < m_tabs.count(); }
 

src/plugins/coreplugin/iwelcomepage.cpp

@@ -157,7 +157,7 @@ void WelcomePageButton::mousePressEvent(QMouseEvent *)
         d->onClicked();
 }
 
-void WelcomePageButton::enterEvent(QEvent *)
+void WelcomePageButton::enterEvent(EnterEvent *)
 {
     d->doUpdate(true);
 }

src/plugins/coreplugin/iwelcomepage.h

@@ -28,6 +28,7 @@
 #include "core_global.h"
 
 #include <utils/id.h>
+#include <utils/porting.h>
 
 #include <QWidget>
 #include <QObject>
@@ -76,7 +77,7 @@ public:
     ~WelcomePageButton() override;
 
     void mousePressEvent(QMouseEvent *) override;
-    void enterEvent(QEvent *) override;
+    void enterEvent(Utils::EnterEvent *) override;
     void leaveEvent(QEvent *) override;
 
     void setText(const QString &text);

src/plugins/debugger/debuggertooltipmanager.cpp

@@ -50,9 +50,10 @@
 #include <texteditor/textdocument.h>
 
 #include <utils/algorithm.h>
+#include <utils/porting.h>
+#include <utils/qtcassert.h>
 #include <utils/tooltip/tooltip.h>
 #include <utils/treemodel.h>
-#include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 
 #include <QAbstractItemModel>
@@ -456,15 +457,9 @@ public:
 
     ~DebuggerToolTipWidget() override { DEBUG("DESTROY DEBUGGERTOOLTIP WIDGET"); }
 
-    void closeEvent(QCloseEvent *) override
+    void closeEvent(QCloseEvent *) override { DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET"); }
-    {
-        DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET");
-    }
 
-    void enterEvent(QEvent *) override
+    void enterEvent(EnterEvent *) override { DEBUG("ENTER DEBUGGERTOOLTIP WIDGET"); }
-    {
-        DEBUG("ENTER DEBUGGERTOOLTIP WIDGET");
-    }
 
     void leaveEvent(QEvent *) override
     {
@@ -1085,7 +1080,7 @@ void DebuggerToolTipManagerPrivate::loadSessionData()
     closeAllToolTips();
     const QString data = SessionManager::value(sessionSettingsKeyC).toString();
     QXmlStreamReader r(data);
-    if (r.readNextStartElement() && r.name() == sessionDocumentC) {
+    if (r.readNextStartElement() && r.name() == QLatin1String(sessionDocumentC)) {
         while (!r.atEnd()) {
             if (readStartElement(r, toolTipElementC)) {
                 const QXmlStreamAttributes attributes = r.attributes();

src/plugins/modeleditor/dragtool.cpp

@@ -120,7 +120,7 @@ void DragTool::paintEvent(QPaintEvent *event)
     }
 }
 
-void DragTool::enterEvent(QEvent *event)
+void DragTool::enterEvent(Utils::EnterEvent *event)
 {
     Q_UNUSED(event)
     update();

src/plugins/modeleditor/dragtool.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <utils/porting.h>
+
 #include <QWidget>
 #include <QIcon>
 
@@ -46,7 +48,7 @@ public:
 
 protected:
     void paintEvent(QPaintEvent *event) override;
-    void enterEvent(QEvent *event) override;
+    void enterEvent(Utils::EnterEvent *event) override;
     void leaveEvent(QEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;

src/plugins/scxmleditor/common/colorthemeview.cpp

@@ -73,7 +73,7 @@ void ColorThemeItem::openColorDialog()
     }
 }
 
-void ColorThemeItem::enterEvent(QEvent *e)
+void ColorThemeItem::enterEvent(Utils::EnterEvent *e)
 {
     m_pen.setWidth(isEnabled() ? 3 : 1);
 

src/plugins/scxmleditor/common/colorthemeview.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <utils/porting.h>
+
 #include <QFrame>
 #include <QPen>
 
@@ -53,7 +55,7 @@ signals:
 
 protected:
     void paintEvent(QPaintEvent *e) override;
-    void enterEvent(QEvent *e) override;
+    void enterEvent(Utils::EnterEvent *e) override;
     void leaveEvent(QEvent *e) override;
     void mousePressEvent(QMouseEvent *e) override;
 

src/plugins/welcome/welcomeplugin.cpp

@@ -41,13 +41,14 @@
 #include <coreplugin/modemanager.h>
 
 #include <utils/algorithm.h>
-#include <utils/icon.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/icon.h>
+#include <utils/porting.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
-#include <utils/treemodel.h>
 #include <utils/theme/theme.h>
+#include <utils/treemodel.h>
 
 #include <QDesktopServices>
 #include <QHeaderView>
@@ -194,7 +195,7 @@ public:
         setLayout(layout);
     }
 
-    void enterEvent(QEvent *) override
+    void enterEvent(EnterEvent *) override
     {
         QPalette pal;
         pal.setColor(QPalette::Window, themeColor(Theme::Welcome_HoverColor));