diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-01-19 08:36:08 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-01-19 15:21:18 +0000 |
| commit | 199c2754d5b44f62f15ca5add6d5c3c1e5009d79 (patch) | |
| tree | 7b7a3c41fd3dcfcfc860aa835f7b6c042e4f421d | |
| parent | bbcff0738416ae00cbc6314bca15aee50ec76371 (diff) | |
QInputAspect: register backend type for QInputSettings
Change-Id: I6fae57e8d76f464be3bfcd0cc4e63b7ca5fe3e48
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index aba2fbba3..f6aecf454 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -47,6 +47,7 @@ #include <Qt3DInput/qmouseinput.h> #include <Qt3DInput/qinputdeviceintegration.h> #include <Qt3DInput/qgenericinputdevice.h> +#include <Qt3DInput/qinputsettings.h> #include <Qt3DInput/private/qinputdeviceintegrationfactory_p.h> #include <Qt3DCore/private/qservicelocator_p.h> #include <Qt3DCore/private/qeventfilterservice_p.h> @@ -80,6 +81,7 @@ #include <Qt3DInput/private/updatehandlerjob_p.h> #include <Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h> #include <Qt3DInput/private/genericdevicebackendnode_p.h> +#include <Qt3DInput/private/inputsettings_p.h> QT_BEGIN_NAMESPACE @@ -121,6 +123,7 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<Qt3DInput::QAxisActionHandler>(QBackendNodeFunctorPtr(new Input::AxisActionHandlerNodeFunctor(d_func()->m_inputHandler->axisActionHandlerManager()))); registerBackendType<QLogicalDevice>(QBackendNodeFunctorPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager()))); registerBackendType<QGenericInputDevice>(QBackendNodeFunctorPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data()))); + registerBackendType<QInputSettings>(QBackendNodeFunctorPtr(new Input::InputSettingsFunctor(d_func()->m_inputHandler.data()))); // Plugins are QInputDeviceIntegration instances loadInputDevicePlugins(); @@ -201,6 +204,7 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time) return jobs; } +// Called in main Thread void QInputAspect::onInitialize(const QVariantMap &) { Q_D(QInputAspect); |