5 files changed, 6 insertions, 85 deletions
diff --git a/src/input/backend/backend.pri b/src/input/backend/backend.pri
deleted file mode 100644
index 3dae8f829..000000000
--- a/src/input/backend/backend.pri
+++ /dev/null
@@ -1,67 +0,0 @@
-HEADERS += \
-    $$PWD/backendnode_p.h \
-    $$PWD/keyboarddevice_p.h \
-    $$PWD/keyboardhandler_p.h \
-    $$PWD/inputhandler_p.h \
-    $$PWD/inputmanagers_p.h \
-    $$PWD/handle_types_p.h \
-    $$PWD/assignkeyboardfocusjob_p.h \
-    $$PWD/mousehandler_p.h \
-    $$PWD/mousedevice_p.h \
-    $$PWD/abstractactioninput_p.h \
-    $$PWD/abstractaxisinput_p.h \
-    $$PWD/actioninput_p.h \
-    $$PWD/axis_p.h \
-    $$PWD/action_p.h \
-    $$PWD/analogaxisinput_p.h \
-    $$PWD/buttonaxisinput_p.h \
-    $$PWD/logicaldevice_p.h \
-    $$PWD/inputbackendnodefunctor_p.h \
-    $$PWD/qabstractphysicaldevicebackendnode_p.h \
-    $$PWD/movingaverage_p.h \
-    $$PWD/axissetting_p.h \
-    $$PWD/qabstractphysicaldevicebackendnode_p_p.h \
-    $$PWD/updateaxisactionjob_p.h \
-    $$PWD/keyboardmousegenericdeviceintegration_p.h \
-    $$PWD/genericdevicebackendnode_p.h \
-    $$PWD/inputchord_p.h \
-    $$PWD/inputsequence_p.h \
-    $$PWD/inputsettings_p.h \
-    $$PWD/job_common_p.h \
-    $$PWD/physicaldeviceproxy_p.h \
-    $$PWD/loadproxydevicejob_p.h \
-    $$PWD/utils_p.h \
-    $$PWD/axisaccumulator_p.h \
-    $$PWD/axisaccumulatorjob_p.h
-
-SOURCES += \
-    $$PWD/backendnode.cpp \
-    $$PWD/keyboarddevice.cpp \
-    $$PWD/keyboardhandler.cpp \
-    $$PWD/inputhandler.cpp \
-    $$PWD/assignkeyboardfocusjob.cpp \
-    $$PWD/mousehandler.cpp \
-    $$PWD/mousedevice.cpp \
-    $$PWD/abstractactioninput.cpp \
-    $$PWD/abstractaxisinput.cpp \
-    $$PWD/actioninput.cpp \
-    $$PWD/axis.cpp \
-    $$PWD/action.cpp \
-    $$PWD/analogaxisinput.cpp \
-    $$PWD/buttonaxisinput.cpp \
-    $$PWD/logicaldevice.cpp \
-    $$PWD/qabstractphysicaldevicebackendnode.cpp \
-    $$PWD/movingaverage.cpp \
-    $$PWD/axissetting.cpp \
-    $$PWD/updateaxisactionjob.cpp \
-    $$PWD/keyboardmousegenericdeviceintegration.cpp \
-    $$PWD/genericdevicebackendnode.cpp \
-    $$PWD/inputchord.cpp \
-    $$PWD/inputsequence.cpp \
-    $$PWD/inputsettings.cpp \
-    $$PWD/physicaldeviceproxy.cpp \
-    $$PWD/loadproxydevicejob.cpp \
-    $$PWD/axisaccumulator.cpp \
-    $$PWD/axisaccumulatorjob.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index f3c407f4a..459d41fe2 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -17,11 +17,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
-
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 class InternalEventFilter : public QObject
 {
 public:
@@ -42,12 +42,8 @@ protected:
         case QEvent::HoverMove: {
             const QHoverEvent *he = static_cast<QHoverEvent *>(e);
             auto mouseEvent = QT_PREPEND_NAMESPACE(QMouseEvent)(QEvent::MouseMove,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                                                                 he->position(),
                                                                 he->globalPosition(),
-#else
-                                                                he->pos(),
-#endif
                                                                 Qt::NoButton, Qt::NoButton,
                                                                 he->modifiers());
             return processMouseEvent(obj, static_cast<QT_PREPEND_NAMESPACE(QMouseEvent) *>(&mouseEvent));
@@ -351,7 +347,6 @@ bool InternalEventFilter::processKeyEvent(QObject *obj, QT_PREPEND_NAMESPACE(QKe
     return false;
 }
 
-
 } // namespace Input
 } // namespace Qt3DInput
 
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index c503dded4..61d26a9fc 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -13,11 +13,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 KeyboardHandler::KeyboardHandler()
     : BackendNode(QBackendNode::ReadWrite)
     , m_inputHandler(nullptr)
diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp
index 7814edb28..7f841d652 100644
--- a/src/input/backend/mousedevice.cpp
+++ b/src/input/backend/mousedevice.cpp
@@ -111,20 +111,11 @@ void MouseDevice::updateMouseEvent(QT_PREPEND_NAMESPACE(QMouseEvent) *event)
     m_mouseState.rightPressed = event->buttons() & (Qt::RightButton);
     const bool pressed = m_mouseState.leftPressed || m_mouseState.centerPressed || m_mouseState.rightPressed;
     if (m_updateAxesContinuously || (m_wasPressed && pressed)) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         m_mouseState.xAxis += m_sensitivity * float(event->globalPosition().x() - m_previousPos.x());
         m_mouseState.yAxis += m_sensitivity * float(m_previousPos.y() - event->globalPosition().y());
-#else
-        m_mouseState.xAxis += m_sensitivity * float(event->globalX() - m_previousPos.x());
-        m_mouseState.yAxis += m_sensitivity * float(m_previousPos.y() - event->globalY());
-#endif
     }
     m_wasPressed = pressed;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     m_previousPos = event->globalPosition();
-#else
-    m_previousPos = event->globalPos();
-#endif
 }
 
 void MouseDevice::resetMouseAxisState()
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index 1e19b191a..d425e712c 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -13,11 +13,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 MouseHandler::MouseHandler()
     : BackendNode(ReadWrite)
     , m_inputHandler(nullptr)