2 files changed, 10 insertions, 11 deletions
diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp
index 2033eed36..2b06c824d 100644
--- a/src/input/frontend/qmouseevent.cpp
+++ b/src/input/frontend/qmouseevent.cpp
@@ -49,7 +49,7 @@ template<typename EventClass, typename QtEventClass>
 typename EventClass::Modifiers modifiersForEvent(const QtEventClass &event)
 {
     const Qt::KeyboardModifiers eventModifiers = event.modifiers();
-    typename EventClass::Modifiers modifiers = EventClass::NoModifier;
+    int modifiers = EventClass::NoModifier;
 
     if (eventModifiers & Qt::ShiftModifier)
         modifiers |= EventClass::ShiftModifier;
@@ -66,7 +66,9 @@ typename EventClass::Modifiers modifiersForEvent(const QtEventClass &event)
     if (eventModifiers & Qt::KeypadModifier)
         modifiers |= EventClass::KeypadModifier;
 
-    return modifiers;
+    // Abuse the int used to store an enum to store multiple
+    // modifiers into one
+    return static_cast<typename EventClass::Modifiers>(modifiers);
 }
 
 } // anonymous
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h
index 1402d8210..ae44d9365 100644
--- a/src/input/frontend/qmouseevent.h
+++ b/src/input/frontend/qmouseevent.h
@@ -70,7 +70,7 @@ public:
     };
     Q_ENUM(Buttons) // LCOV_EXCL_LINE
 
-    enum Modifier {
+    enum Modifiers {
         NoModifier = Qt::NoModifier,
         ShiftModifier = Qt::ShiftModifier,
         ControlModifier = Qt::ControlModifier,
@@ -78,8 +78,8 @@ public:
         MetaModifier = Qt::MetaModifier,
         KeypadModifier = Qt::KeypadModifier
     };
-    Q_DECLARE_FLAGS(Modifiers, Modifier)
-    Q_FLAG(Modifiers)
+    Q_ENUM(Modifiers) // LCOV_EXCL_LINE
+    // TO DO Qt6 Modifiers -> Modifier and add Q_FLAG(Modifiers)
 
     explicit QMouseEvent(const QT_PREPEND_NAMESPACE(QMouseEvent) &e);
     ~QMouseEvent();
@@ -128,7 +128,7 @@ public:
     };
     Q_ENUM(Buttons) // LCOV_EXCL_LINE
 
-    enum Modifier {
+    enum Modifiers {
         NoModifier = Qt::NoModifier,
         ShiftModifier = Qt::ShiftModifier,
         ControlModifier = Qt::ControlModifier,
@@ -136,8 +136,8 @@ public:
         MetaModifier = Qt::MetaModifier,
         KeypadModifier = Qt::KeypadModifier
     };
-    Q_DECLARE_FLAGS(Modifiers, Modifier)
-    Q_FLAG(Modifiers)
+    Q_ENUM(Modifiers) // LCOV_EXCL_LINE
+    // TO DO Qt6 Modifiers -> Modifier and add Q_FLAG(Modifiers)
 
     explicit QWheelEvent(const QT_PREPEND_NAMESPACE(QWheelEvent) &e);
     ~QWheelEvent();
@@ -161,9 +161,6 @@ typedef QSharedPointer<QWheelEvent> QWheelEventPtr;
 
 } // namespace Qt3DInput
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt3DInput::QMouseEvent::Modifiers)
-Q_DECLARE_OPERATORS_FOR_FLAGS(Qt3DInput::QWheelEvent::Modifiers)
-
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DInput::QMouseEvent*) // LCOV_EXCL_LINE