diff --git a/Global/QtCompat.h b/Global/QtCompat.h
index 53e36c366..a7ec2cb2f 100644
--- 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
index 9b0bfc35f..f4c189ade 100644
--- 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
index 668f1005a..9a2c57dcb 100644
--- 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
index 04d0b73a3..cde56d34e 100644
--- 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
index 7cedd74ce..1e3bbfd1b 100644
--- a/Gui/CurveEditor.h
+++ b/Gui/CurveEditor.h
@@ -28,7 +28,6 @@
 
 #include "Global/Macros.h"
 
-#include "Global/Macros.h"
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QWidget>
@@ -36,6 +35,7 @@ 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
index 67fe8b60e..a52108e62 100644
--- 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
index 1d9015a34..8aaab9d92 100644
--- 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
index 7a1db6258..4474c6d23 100644
--- 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
index 91f02a978..3ba62c693 100644
--- 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
index d5fdde1c4..b019247cd 100644
--- 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
index 6f09fab58..c32ccb8e8 100644
--- 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
index 5abbbdbe3..8ff4a8a21 100644
--- 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
index 1af3e8918..dd2e9a7ea 100644
--- 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
index ad86679b8..7604ac2c7 100644
--- 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
index 2a9ae4955..803ce74b8 100644
--- 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
index 1b4218c80..aaa889015 100644
--- 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
index 683c7cfe6..ce7289278 100644
--- 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
index 7dd3df212..dc5d847ab 100644
--- 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
index d0ef55d9e..78e72d70f 100644
--- 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
index 0217f1843..fec6e76dd 100644
--- 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
index 33677da99..fe6f412a4 100644
--- 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
index e7a245367..f1159df17 100644
--- 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
index b5797aefa..e687f3f39 100644
--- 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
index 539823885..441c629e2 100644
--- 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
index bad5bb61a..b7070113d 100644
--- 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
index 1b3c6d062..8bc0ba1a7 100644
--- 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
index 4478aa47d..fa81ae0ed 100644
--- 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);
diff --git a/Gui/PythonPanels.h b/Gui/PythonPanels.h
index b4acbe6f4..31bb91ebb 100644
--- a/Gui/PythonPanels.h
+++ b/Gui/PythonPanels.h
@@ -36,6 +36,8 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#include "Global/QtCompat.h"
+
 #include "Engine/PyNode.h"
 #include "Engine/ScriptObject.h"
 #include "Engine/Knob.h"
@@ -157,7 +159,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
     void onUserDataChanged();
     virtual void mousePressEvent(QMouseEvent* e) OVERRIDE;
-    virtual void enterEvent(QEvent* e) OVERRIDE;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE;
     virtual void leaveEvent(QEvent* e) OVERRIDE;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE;
 
diff --git a/Gui/RightClickableWidget.cpp b/Gui/RightClickableWidget.cpp
index a1050b2ce..289f04c8f 100644
--- a/Gui/RightClickableWidget.cpp
+++ b/Gui/RightClickableWidget.cpp
@@ -68,7 +68,7 @@ RightClickableWidget::keyPressEvent(QKeyEvent* e)
 }
 
 void
-RightClickableWidget::enterEvent(QEvent* e)
+RightClickableWidget::enterEvent(QtCompat::QEnterEvent* e)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
diff --git a/Gui/RightClickableWidget.h b/Gui/RightClickableWidget.h
index 853c1e62f..bae04d741 100644
--- a/Gui/RightClickableWidget.h
+++ b/Gui/RightClickableWidget.h
@@ -39,6 +39,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Engine/DockablePanelI.h"
 
@@ -80,7 +81,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
 private:
 
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void mousePressEvent(QMouseEvent* e) OVERRIDE FINAL;
 };
diff --git a/Gui/ScaleSliderQWidget.cpp b/Gui/ScaleSliderQWidget.cpp
index 195d4ce43..65861c0b0 100644
--- a/Gui/ScaleSliderQWidget.cpp
+++ b/Gui/ScaleSliderQWidget.cpp
@@ -277,7 +277,7 @@ ScaleSliderQWidget::zoomRange()
 }
 
 void
-ScaleSliderQWidget::enterEvent(QEvent* e)
+ScaleSliderQWidget::enterEvent(QtCompat::QEnterEvent* e)
 {
     if ( Gui::isFocusStealingPossible() ) {
         setFocus();
diff --git a/Gui/ScaleSliderQWidget.h b/Gui/ScaleSliderQWidget.h
index 642b4d777..4c812453c 100644
--- a/Gui/ScaleSliderQWidget.h
+++ b/Gui/ScaleSliderQWidget.h
@@ -36,6 +36,7 @@ CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Gui/GuiFwd.h"
 
@@ -121,7 +122,7 @@ public Q_SLOTS:
     virtual QSize minimumSizeHint() const OVERRIDE FINAL;
     virtual void paintEvent(QPaintEvent* e) OVERRIDE FINAL;
     virtual void resizeEvent(QResizeEvent* 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 focusInEvent(QFocusEvent* e) OVERRIDE FINAL;
     virtual void focusOutEvent(QFocusEvent* e) OVERRIDE FINAL;
diff --git a/Gui/ScriptEditor.cpp b/Gui/ScriptEditor.cpp
index a5957e524..62f5cf673 100644
--- a/Gui/ScriptEditor.cpp
+++ b/Gui/ScriptEditor.cpp
@@ -621,7 +621,7 @@ ScriptEditor::printAutoDeclaredVariable(const QString& str)
 }
 
 void
-ScriptEditor::enterEvent(QEvent *e)
+ScriptEditor::enterEvent(QtCompat::QEnterEvent *e)
 {
     enterEventBase();
     QWidget::enterEvent(e);
diff --git a/Gui/ScriptEditor.h b/Gui/ScriptEditor.h
index f2c32a929..6ac9f6c16 100644
--- a/Gui/ScriptEditor.h
+++ b/Gui/ScriptEditor.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"
 
@@ -111,7 +113,7 @@ public Q_SLOTS:
 
     virtual void focusInEvent(QFocusEvent* e) OVERRIDE FINAL;
     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/ScriptTextEdit.cpp b/Gui/ScriptTextEdit.cpp
index 5d58f1ad9..76f929495 100644
--- a/Gui/ScriptTextEdit.cpp
+++ b/Gui/ScriptTextEdit.cpp
@@ -497,7 +497,7 @@ InputScriptTextEdit::dropEvent(QDropEvent* e)
 }
 
 void
-InputScriptTextEdit::enterEvent(QEvent* /*e*/)
+InputScriptTextEdit::enterEvent(QtCompat::QEnterEvent* /*e*/)
 {
     if ( acceptDrops() && (cursor().shape() != Qt::OpenHandCursor) ) {
         setCursor(Qt::OpenHandCursor);
diff --git a/Gui/ScriptTextEdit.h b/Gui/ScriptTextEdit.h
index f3ee988c8..9a3ad517d 100644
--- a/Gui/ScriptTextEdit.h
+++ b/Gui/ScriptTextEdit.h
@@ -37,6 +37,8 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#include "Global/QtCompat.h"
+
 #include "Gui/GuiFwd.h"
 
 NATRON_NAMESPACE_ENTER
@@ -98,7 +100,7 @@ private Q_SLOTS:
     virtual void dropEvent(QDropEvent* e) OVERRIDE FINAL;
     virtual void resizeEvent(QResizeEvent *event) OVERRIDE FINAL;
     virtual void dragMoveEvent(QDragMoveEvent* 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;
 
 private:
diff --git a/Gui/SpinBox.cpp b/Gui/SpinBox.cpp
index df81b71a7..4e95d68f8 100644
--- a/Gui/SpinBox.cpp
+++ b/Gui/SpinBox.cpp
@@ -1000,7 +1000,7 @@ KnobSpinBox::~KnobSpinBox()
 }
 
 void
-KnobSpinBox::enterEvent(QEvent* e)
+KnobSpinBox::enterEvent(QtCompat::QEnterEvent* e)
 {
     _dnd->mouseEnter(e);
     SpinBox::enterEvent(e);
diff --git a/Gui/SpinBox.h b/Gui/SpinBox.h
index d321d9166..1ad1cc134 100644
--- a/Gui/SpinBox.h
+++ b/Gui/SpinBox.h
@@ -27,6 +27,7 @@
 // ***** END PYTHON BLOCK *****
 
 #include "Global/Macros.h"
+#include "Global/QtCompat.h"
 
 #include "Gui/LineEdit.h"
 #include "Gui/GuiFwd.h"
@@ -171,7 +172,7 @@ class KnobSpinBox
 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/TabWidget.cpp b/Gui/TabWidget.cpp
index f6f49cabd..fa7279308 100644
--- a/Gui/TabWidget.cpp
+++ b/Gui/TabWidget.cpp
@@ -2070,7 +2070,7 @@ TabWidget::leaveEvent(QEvent* e)
 }
 
 void
-TabWidget::enterEvent(QEvent* e)
+TabWidget::enterEvent(QtCompat::QEnterEvent* e)
 {
     if (_imp->gui) {
         _imp->gui->setLastEnteredTabWidget(this);
diff --git a/Gui/TabWidget.h b/Gui/TabWidget.h
index 632c9adfc..99d579224 100644
--- a/Gui/TabWidget.h
+++ b/Gui/TabWidget.h
@@ -39,6 +39,8 @@ CLANG_DIAG_OFF(uninitialized)
 CLANG_DIAG_ON(deprecated)
 CLANG_DIAG_ON(uninitialized)
 
+#include "Global/QtCompat.h"
+
 #include "Gui/GuiFwd.h"
 
 NATRON_NAMESPACE_ENTER
@@ -352,7 +354,7 @@ public Q_SLOTS:
     virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL;
     virtual void mouseMoveEvent(QMouseEvent* e) OVERRIDE FINAL;
     virtual void leaveEvent(QEvent* e) OVERRIDE FINAL;
-    virtual void enterEvent(QEvent* e) OVERRIDE FINAL;
+    virtual void enterEvent(QtCompat::QEnterEvent* e) OVERRIDE FINAL;
 
 private:
 
diff --git a/Gui/TimeLineGui.cpp b/Gui/TimeLineGui.cpp
index 0a077ea85..a4da578a4 100644
--- a/Gui/TimeLineGui.cpp
+++ b/Gui/TimeLineGui.cpp
@@ -1007,7 +1007,7 @@ TimeLineGui::mouseMoveEvent(QMouseEvent* e)
 } // TimeLineGui::mouseMoveEvent
 
 void
-TimeLineGui::enterEvent(QEvent* e)
+TimeLineGui::enterEvent(QtCompat::QEnterEvent* e)
 {
     _imp->alphaCursor = true;
     update();
diff --git a/Gui/TimeLineGui.h b/Gui/TimeLineGui.h
index db13f5ff7..dbbd404d9 100644
--- a/Gui/TimeLineGui.h
+++ b/Gui/TimeLineGui.h
@@ -42,6 +42,7 @@ CLANG_DIAG_ON(uninitialized)
 #include <QOpenGLWidget>
 
 #include "Global/GlobalDefines.h"
+#include "Global/QtCompat.h"
 
 #include "Gui/GuiFwd.h"
 
@@ -166,7 +167,7 @@ public Q_SLOTS:
     virtual void mouseMoveEvent(QMouseEvent* e) OVERRIDE FINAL;
     virtual void mouseReleaseEvent(QMouseEvent* e) OVERRIDE FINAL;
     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 QSize sizeHint() const OVERRIDE FINAL;
 
diff --git a/Gui/ViewerGL.cpp b/Gui/ViewerGL.cpp
index eeb97bf44..ff3169657 100644
--- a/Gui/ViewerGL.cpp
+++ b/Gui/ViewerGL.cpp
@@ -3100,7 +3100,7 @@ ViewerGL::focusOutEvent(QFocusEvent* e)
 }
 
 void
-ViewerGL::enterEvent(QEvent* e)
+ViewerGL::enterEvent(QtCompat::QEnterEvent* e)
 {
     // always running in the main thread
     assert( qApp && qApp->thread() == QThread::currentThread() );
diff --git a/Gui/ViewerGL.h b/Gui/ViewerGL.h
index 631fe88bf..9015efa5b 100644
--- a/Gui/ViewerGL.h
+++ b/Gui/ViewerGL.h
@@ -38,6 +38,8 @@
 
 #include <QOpenGLWidget>
 
+#include "Global/QtCompat.h"
+
 #include "Engine/OpenGLViewerI.h"
 #include "Engine/ViewIdx.h"
 #include "Engine/EngineFwd.h"
@@ -494,7 +496,7 @@ public Q_SLOTS:
     virtual void wheelEvent(QWheelEvent* e) OVERRIDE FINAL;
     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 tabletEvent(QTabletEvent* e) OVERRIDE FINAL;
 
diff --git a/Gui/ViewerTab.h b/Gui/ViewerTab.h
index c94f7f3c8..686e7ad51 100644
--- a/Gui/ViewerTab.h
+++ b/Gui/ViewerTab.h
@@ -30,6 +30,7 @@
 
 #include "Global/GlobalDefines.h"
 #include "Global/KeySymbols.h" // Key
+#include "Global/QtCompat.h"
 
 #include "Engine/RenderStats.h"
 #include "Engine/ViewIdx.h"
@@ -467,7 +468,7 @@ public Q_SLOTS:
     virtual bool eventFilter(QObject *target, QEvent* 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 QSize minimumSizeHint() const OVERRIDE FINAL;
     virtual QSize sizeHint() const OVERRIDE FINAL;
diff --git a/Gui/ViewerTab10.cpp b/Gui/ViewerTab10.cpp
index 86e6857a5..a31ed53aa 100644
--- a/Gui/ViewerTab10.cpp
+++ b/Gui/ViewerTab10.cpp
@@ -589,7 +589,7 @@ ViewerTab::previousLayer()
 }
 
 void
-ViewerTab::enterEvent(QEvent* e)
+ViewerTab::enterEvent(QtCompat::QEnterEvent* e)
 {
     enterEventBase();
     QWidget::enterEvent(e);