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/quick3d/imports/input/qt3dquick3dinputplugin.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/quick3d/imports/input/qt3dquick3dinputplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 25b4ae276..c18beb81d 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -46,10 +46,10 @@ #include <Qt3DInput/qmouseevent.h> #include <Qt3DInput/qaxis.h> -#include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qaction.h> #include <Qt3DInput/qactioninput.h> +#include <Qt3DInput/qanalogaxisinput.h> #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qinputsequence.h> #include <Qt3DInput/qinputchord.h> @@ -89,6 +89,7 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput"); qmlRegisterType<Qt3DInput::QAxisInput>(uri, 2, 0, "AxisInput"); qmlRegisterType<Qt3DInput::QAxisSetting>(uri, 2, 0, "AxisSetting"); + qmlRegisterType<Qt3DInput::QAnalogAxisInput>(uri, 2, 0, "AnalogAxisInput"); qmlRegisterType<Qt3DInput::QButtonAxisInput>(uri, 2, 0, "ButtonAxisInput"); qmlRegisterExtendedType<Qt3DInput::QAxis, Qt3DInput::Input::Quick::Quick3DAxis>(uri, 2, 0, "Axis"); qmlRegisterExtendedType<Qt3DInput::QAction, Qt3DInput::Input::Quick::Quick3DAction>(uri, 2, 0, "Action"); |