diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-04-29 08:42:52 +0200 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-02 10:26:42 +0000 |
| commit | 496d8b53b16bd0703ab06978f18fcbbb7d95e845 (patch) | |
| tree | 0360d6ea61941e4da7ab6574ff1fb6c342e06c88 /src/input/frontend/qinputaspect.cpp | |
| parent | 57f6c8bb2f7b220532d5ec4c46ee7d5b7f007067 (diff) | |
Split QAnalogAxisInput out of QAxisInput
The axis property of QAxisInput goes there.
Change-Id: Ie226de652848909fc6e3a425612d877ef18b35f3
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend/qinputaspect.cpp')
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 0169be233..fa856a750 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -62,9 +62,9 @@ #include <Qt3DInput/qaxis.h> #include <Qt3DInput/qaction.h> -#include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qactioninput.h> +#include <Qt3DInput/qanalogaxisinput.h> #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qinputchord.h> #include <Qt3DInput/qinputsequence.h> @@ -119,6 +119,7 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<QMouseHandler>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data()))); registerBackendType<QAxis>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Axis, Input::AxisManager>(d_func()->m_inputHandler->axisManager()))); registerBackendType<QAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisInput, Input::AxisInputManager>(d_func()->m_inputHandler->axisInputManager()))); + registerBackendType<QAnalogAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AnalogAxisInput, Input::AnalogAxisInputManager>(d_func()->m_inputHandler->analogAxisInputManager()))); registerBackendType<QButtonAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager()))); registerBackendType<QAxisSetting>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager()))); registerBackendType<Qt3DInput::QAction>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager()))); |