NatronGitHub · acolwell · May 7, 2025 · May 3, 2025
diff --git a/Global/QtCompat.h b/Global/QtCompat.h
@@ -46,6 +46,15 @@ removeFileExtension(QString & filename)
     return extension;
 }
 
+// Define compatibility typedefs so code builds with Qt5 & Qt6
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+typedef QEnterEvent QEnterEvent;
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+typedef QEvent QEnterEvent;
+#else
+#error "Unsupported version of QT"
+#endif
+
 } // namespace QtCompat
 
 NATRON_NAMESPACE_EXIT

diff --git a/Gui/ClickableLabel.cpp b/Gui/ClickableLabel.cpp
@@ -180,7 +180,7 @@ KnobClickableLabel::~KnobClickableLabel()
 }
 
 void
-KnobClickableLabel::enterEvent(QEvent* e)
+KnobClickableLabel::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     ClickableLabel::enterEvent(e);

diff --git a/Gui/ClickableLabel.h b/Gui/ClickableLabel.h
@@ -34,7 +34,7 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
-#include "Global/Macros.h"
+#include "Global/QtCompat.h"
 #include "Gui/Label.h"
 #include "Gui/GuiFwd.h"
 
@@ -143,7 +143,7 @@ class KnobClickableLabel
 
 private:
 
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/CurveEditor.cpp b/Gui/CurveEditor.cpp
@@ -1559,7 +1559,7 @@ CurveEditor::keyReleaseEvent(QKeyEvent* e)
 }
 
 void
-CurveEditor::enterEvent(QEvent* e)
+CurveEditor::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QWidget::enterEvent(e);

diff --git a/Gui/CurveEditor.h b/Gui/CurveEditor.h
@@ -28,14 +28,14 @@
 
 #include "Global/Macros.h"
 
-#include "Global/Macros.h"
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QWidget>
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/EngineFwd.h"
 
@@ -380,7 +380,7 @@ public Q_SLOTS:
 private:
 
     virtual QUndoStack* getUndoStack() const OVERRIDE FINAL WARN_UNUSED_RETURN;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/CurveWidget.cpp b/Gui/CurveWidget.cpp
@@ -1592,7 +1592,7 @@ CurveWidget::keyPressEvent(QKeyEvent* e)
 } // keyPressEvent
 
 void
-CurveWidget::enterEvent(QEvent* e)
+CurveWidget::enterEvent(QtCompat::QEnterEvent* e)
 {
     setFocus();
     QOpenGLWidget::enterEvent(e);

diff --git a/Gui/CurveWidget.h b/Gui/CurveWidget.h
@@ -44,6 +44,7 @@ CLANG_DIAG_ON(uninitialized)
 #include <QOpenGLWidget>
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/OverlaySupport.h"
 #include "Engine/Curve.h"
@@ -230,7 +231,7 @@ public Q_SLOTS:
     virtual void mouseDoubleClickEvent(QMouseEvent* e) OVERRIDE FINAL;
     virtual void mouseReleaseEvent(QMouseEvent* e) OVERRIDE FINAL;
     virtual void mouseMoveEvent(QMouseEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void wheelEvent(QWheelEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void focusInEvent(QFocusEvent* e) OVERRIDE FINAL;

diff --git a/Gui/DopeSheetEditor.cpp b/Gui/DopeSheetEditor.cpp
@@ -264,7 +264,7 @@ DopeSheetEditor::keyReleaseEvent(QKeyEvent* e)
 }
 
 void
-DopeSheetEditor::enterEvent(QEvent *e)
+DopeSheetEditor::enterEvent(QtCompat::QEnterEvent *e)
 {
     enterEventBase();
     QWidget::enterEvent(e);

diff --git a/Gui/DopeSheetEditor.h b/Gui/DopeSheetEditor.h
@@ -37,6 +37,8 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#include "Global/QtCompat.h"
+
 #include "Gui/PanelWidget.h"
 #include "Gui/GuiFwd.h"
 
@@ -122,7 +124,7 @@ class DopeSheetEditor
 
 private:
 
-    virtual void enterEvent(QEvent *e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent *e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent *e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp
@@ -65,6 +65,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON
 #include <cairo/cairo.h>
 
 #include "Global/ProcInfo.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/Image.h"
 #include "Engine/KnobFile.h"
@@ -523,7 +524,7 @@ class AutoRaiseToolButton
         }
     }
 
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL
     {
         AutoRaiseToolButton* btn = dynamic_cast<AutoRaiseToolButton*>( _gui->getToolButtonMenuOpened() );
 

diff --git a/Gui/Histogram.cpp b/Gui/Histogram.cpp
@@ -1483,7 +1483,7 @@ Histogram::keyReleaseEvent(QKeyEvent* e)
 }
 
 void
-Histogram::enterEvent(QEvent* e)
+Histogram::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QOpenGLWidget::enterEvent(e);

diff --git a/Gui/Histogram.h b/Gui/Histogram.h
@@ -36,6 +36,8 @@ CLANG_DIAG_ON(uninitialized)
 
 #include <QOpenGLWidget>
 
+#include <Global/QtCompat.h>
+
 #include "Gui/PanelWidget.h"
 #include "Gui/GuiFwd.h"
 
@@ -109,7 +111,7 @@ public Q_SLOTS:
     virtual void wheelEvent(QWheelEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void showEvent(QShowEvent* e) OVERRIDE FINAL;
     virtual QSize sizeHint() const OVERRIDE FINAL;

diff --git a/Gui/KnobGuiBool.cpp b/Gui/KnobGuiBool.cpp
@@ -113,7 +113,7 @@ Bool_CheckBox::getBackgroundColor(double *r,
 }
 
 void
-Bool_CheckBox::enterEvent(QEvent* e)
+Bool_CheckBox::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     AnimatedCheckBox::enterEvent(e);

diff --git a/Gui/KnobGuiBool.h b/Gui/KnobGuiBool.h
@@ -40,6 +40,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/Singleton.h"
 #include "Engine/Knob.h"
@@ -77,7 +78,7 @@ class Bool_CheckBox
 
 private:
 
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/KnobGuiChoice.cpp b/Gui/KnobGuiChoice.cpp
@@ -116,7 +116,7 @@ KnobComboBox::wheelEvent(QWheelEvent *e)
 }
 
 void
-KnobComboBox::enterEvent(QEvent* e)
+KnobComboBox::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     ComboBox::enterEvent(e);

diff --git a/Gui/KnobGuiChoice.h b/Gui/KnobGuiChoice.h
@@ -40,6 +40,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/Singleton.h"
 #include "Engine/Knob.h"
@@ -68,7 +69,7 @@ class KnobComboBox
 private:
 
     virtual void wheelEvent(QWheelEvent *e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/KnobGuiColor.cpp b/Gui/KnobGuiColor.cpp
@@ -106,7 +106,7 @@ ColorPickerLabel::mousePressEvent(QMouseEvent*)
 }
 
 void
-ColorPickerLabel::enterEvent(QEvent*)
+ColorPickerLabel::enterEvent(QtCompat::QEnterEvent*)
 {
     QToolTip::showText( QCursor::pos(), toolTip() );
 }

diff --git a/Gui/KnobGuiColor.h b/Gui/KnobGuiColor.h
@@ -41,6 +41,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/Singleton.h"
 #include "Engine/Knob.h"
@@ -97,7 +98,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
 private:
 
-    virtual void enterEvent(QEvent*) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent*) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent*) OVERRIDE FINAL;
     virtual void mousePressEvent(QMouseEvent*) OVERRIDE FINAL;
 

diff --git a/Gui/KnobGuiString.cpp b/Gui/KnobGuiString.cpp
@@ -147,7 +147,7 @@ AnimatingTextEdit::setDirty(bool b)
 }
 
 void
-AnimatingTextEdit::enterEvent(QEvent* e)
+AnimatingTextEdit::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     QTextEdit::enterEvent(e);
@@ -270,7 +270,7 @@ KnobLineEdit::~KnobLineEdit()
 }
 
 void
-KnobLineEdit::enterEvent(QEvent* e)
+KnobLineEdit::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     LineEdit::enterEvent(e);

diff --git a/Gui/KnobGuiString.h b/Gui/KnobGuiString.h
@@ -40,6 +40,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/Singleton.h"
 #include "Engine/Knob.h"
@@ -109,7 +110,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE;
     virtual void paintEvent(QPaintEvent* e) OVERRIDE;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void mousePressEvent(QMouseEvent* e) OVERRIDE FINAL;
     virtual void mouseMoveEvent(QMouseEvent* e) OVERRIDE FINAL;
@@ -140,7 +141,7 @@ class KnobLineEdit
 
     virtual void focusInEvent(QFocusEvent* e) OVERRIDE FINAL;
     virtual void focusOutEvent(QFocusEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/NodeGraph.h b/Gui/NodeGraph.h
@@ -41,6 +41,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/NodeGraphI.h"
 #include "Engine/EngineFwd.h"
@@ -260,7 +261,7 @@ public Q_SLOTS:
 
     bool isNearbyNavigator(const QPoint& widgetPos, QPointF& scenePos) const;
 
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/NodeGraph30.cpp b/Gui/NodeGraph30.cpp
@@ -139,7 +139,7 @@ NodeGraph::connectCurrentViewerToSelection(int inputNB,
 } // connectCurrentViewerToSelection
 
 void
-NodeGraph::enterEvent(QEvent* e)
+NodeGraph::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QGraphicsView::enterEvent(e);

diff --git a/Gui/ProgressPanel.cpp b/Gui/ProgressPanel.cpp
@@ -299,7 +299,7 @@ ProgressPanel::keyReleaseEvent(QKeyEvent* e)
 }
 
 void
-ProgressPanel::enterEvent(QEvent* e)
+ProgressPanel::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QWidget::enterEvent(e);

diff --git a/Gui/ProgressPanel.h b/Gui/ProgressPanel.h
@@ -34,6 +34,8 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#include "Global/QtCompat.h"
+
 #include "Gui/PanelWidget.h"
 #include "Gui/GuiFwd.h"
 
@@ -139,7 +141,7 @@ public Q_SLOTS:
     // overridden from QWidget
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     std::unique_ptr<ProgressPanelPrivate> _imp;
     TaskBar *_taskbar;

diff --git a/Gui/PropertiesBinWrapper.cpp b/Gui/PropertiesBinWrapper.cpp
@@ -54,7 +54,7 @@ PropertiesBinWrapper::mousePressEvent(QMouseEvent* e)
 }
 
 void
-PropertiesBinWrapper::enterEvent(QEvent* e)
+PropertiesBinWrapper::enterEvent(QtCompat::QEnterEvent* e)
 {
     QWidget::enterEvent(e);
 }

diff --git a/Gui/PropertiesBinWrapper.h b/Gui/PropertiesBinWrapper.h
@@ -27,6 +27,7 @@
 // ***** END PYTHON BLOCK *****
 
 #include "Global/Macros.h"
+#include "Global/QtCompat.h"
 
 #include "Gui/PanelWidget.h"
 #include "Gui/GuiFwd.h"
@@ -44,7 +45,7 @@ class PropertiesBinWrapper
 
 private:
     virtual void mousePressEvent(QMouseEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void keyReleaseEvent(QKeyEvent* e) OVERRIDE FINAL;

diff --git a/Gui/PythonPanels.cpp b/Gui/PythonPanels.cpp
@@ -538,7 +538,7 @@ PyPanel::mousePressEvent(QMouseEvent* e)
 }
 
 void
-PyPanel::enterEvent(QEvent* e)
+PyPanel::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QWidget::enterEvent(e);
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ ColorPickerLabel::mousePressEvent(QMouseEvent*) @@
     }
     void
-    ColorPickerLabel::enterEvent(QEvent*)
+    ColorPickerLabel::enterEvent(QtCompat::QEnterEvent*)
     {
         QToolTip::showText( QCursor::pos(), toolTip() );
     }
@@ Expand Down @@