From 090ea5502eac39565e33b3882f2173dd5eae473d Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Fri, 20 Nov 2020 17:26:26 +0000 Subject: Enable compiling non-QML API against Qt 5.15 Built with QtQuick disabled. - C++17 required - minor issues with QList vs QVector - QMutexLocker templated vs not - moc forward declaration handling Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599 Reviewed-by: Paul Lemire --- src/input/backend/actioninput.cpp | 1 - src/input/backend/axissetting.cpp | 1 - src/input/frontend/qkeyboardhandler.h | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input') diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp index 805fde1cf..ed8708949 100644 --- a/src/input/backend/actioninput.cpp +++ b/src/input/backend/actioninput.cpp @@ -53,7 +53,6 @@ namespace Input { ActionInput::ActionInput() : AbstractActionInput() - , m_buttons(0) { } diff --git a/src/input/backend/axissetting.cpp b/src/input/backend/axissetting.cpp index 53e645c4d..c640cd35a 100644 --- a/src/input/backend/axissetting.cpp +++ b/src/input/backend/axissetting.cpp @@ -51,7 +51,6 @@ namespace Input { AxisSetting::AxisSetting() : BackendNode() , m_deadZoneRadius(0.0f) - , m_axes(0) , m_smooth(false) { } diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h index 6dac60c37..ba6119bc0 100644 --- a/src/input/frontend/qkeyboardhandler.h +++ b/src/input/frontend/qkeyboardhandler.h @@ -56,7 +56,9 @@ class Q_3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent Q_OBJECT Q_PROPERTY(Qt3DInput::QKeyboardDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_MOC_INCLUDE("Qt3DInput/qkeyboarddevice.h") +#endif public: explicit QKeyboardHandler(QNode *parent = nullptr); ~QKeyboardHandler(); -- cgit v1.2.3