diff options
author | Mike Krus <mike.krus@kdab.com> | 2016-03-04 21:20:37 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-05 01:07:11 +0000 |
commit | 2b90bd2976be13af392fb290b68b9dba864798f2 (patch) | |
tree | cefd9041b041fa62fc5b2133d41f5ee587e8728e /src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | |
parent | c3ed77c7affb071e47c1d5efefa8cad4e595ac32 (diff) |
Renamed to QKeyboardHandler
Also:
- rename property controller to sourceDevice
- remove protected ctor
- move keyEvent() to the dpointer class
Change-Id: I0badbc4d0ef0bcc202866f8cbdbaea8d107374fa
Task-Id: QTBUG-51439
Reviewed-by: Sean Harmer <sean.harmer@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 36c13e8a2..80195cc39 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -40,7 +40,7 @@ #include <QtQml> #include <Qt3DInput/qgenericinputdevice.h> #include <Qt3DInput/qkeyboardcontroller.h> -#include <Qt3DInput/qkeyboardinput.h> +#include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DInput/qkeyevent.h> #include <Qt3DInput/qmousecontroller.h> #include <Qt3DInput/qmousehandler.h> @@ -74,7 +74,7 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<Qt3DInput::QKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); qmlRegisterType<Qt3DInput::QKeyboardController>(uri, 2, 0, "KeyboardController"); - qmlRegisterType<Qt3DInput::QKeyboardInput>(uri, 2, 0, "KeyboardInput"); + qmlRegisterType<Qt3DInput::QKeyboardHandler>(uri, 2, 0, "KeyboardHandler"); qmlRegisterType<Qt3DInput::QInputSettings>(uri, 2, 0, "InputSettings"); qmlRegisterUncreatableType<Qt3DInput::QMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); |