diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-12-01 12:14:55 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-04 16:22:53 +0000 |
| commit | 39dece190a3954d0b1b0fca1e41bd826df44e4cf (patch) | |
| tree | 018f1c6c98c37412d1ca756dcd9c315048ca9207 /src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | |
| parent | 1abd0a0e425501d75bf202d85f6441562100f416 (diff) | |
Rename QActionHandler to QAxisActionhandler
No need to have two classes for the handlers.
Change-Id: Ia174502f21b5392179774ce8e0d8f2cd228a7ea6
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 842f62ffa..4755e8c29 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -45,7 +45,7 @@ #include <Qt3DInput/qaxis.h> #include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/qaction.h> -#include <Qt3DInput/qactionhandler.h> +#include <Qt3DInput/qaxisactionhandler.h> #include <Qt3DInput/qactioninput.h> #include <Qt3DInput/qlogicaldevice.h> #include <Qt3DInput/qabstractphysicaldevice.h> @@ -70,7 +70,7 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DInput::QMouseController>(uri, 2, 0, "MouseController"); qmlRegisterExtendedType<Qt3DInput::QLogicalDevice, Qt3DInput::Input::Quick::Quick3DLogicalDevice>(uri, 2, 0, "LogicalDevice"); - qmlRegisterType<Qt3DInput::QActionHandler>(uri, 2, 0, "ActionHandler"); + qmlRegisterType<Qt3DInput::QAxisActionHandler>(uri, 2, 0, "ActionHandler"); qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput"); qmlRegisterType<Qt3DInput::QAxisInput>(uri, 2, 0, "AxisInput"); qmlRegisterExtendedType<Qt3DInput::QAxis, Qt3DInput::Input::Quick::Quick3DAxis>(uri, 2, 0, "Axis"); |