diff options
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 14 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 537e27f7b..aa3b2710e 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<Qt3D::Q3DKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3D::QKeyboardController>(uri, 2, 0, "KeyboardController"); - qmlRegisterType<Qt3D::QKeyboardInput>(uri, 2, 0, "KeyboardInput"); + qmlRegisterUncreatableType<Qt3DInput::Q3DKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); + qmlRegisterType<Qt3DInput::QKeyboardController>(uri, 2, 0, "KeyboardController"); + qmlRegisterType<Qt3DInput::QKeyboardInput>(uri, 2, 0, "KeyboardInput"); - qmlRegisterUncreatableType<Qt3D::Q3DMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); - qmlRegisterUncreatableType<Qt3D::Q3DWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3D::QMouseInput>(uri, 2, 0, "MouseInput"); - qmlRegisterType<Qt3D::QMouseController>(uri, 2, 0, "MouseController"); + qmlRegisterUncreatableType<Qt3DInput::Q3DMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); + qmlRegisterUncreatableType<Qt3DInput::Q3DWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); + qmlRegisterType<Qt3DInput::QMouseInput>(uri, 2, 0, "MouseInput"); + qmlRegisterType<Qt3DInput::QMouseController>(uri, 2, 0, "MouseController"); } QT_END_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 79aa2b4e5..72506c8aa 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -508,7 +508,7 @@ void Scene3DItem::setAspects(const QStringList &aspects) if (aspect == QStringLiteral("render")) // This one is hardwired anyway continue; if (aspect == QStringLiteral("input")) { - m_aspectEngine->registerAspect(new Qt3D::QInputAspect); + m_aspectEngine->registerAspect(new Qt3DInput::QInputAspect); continue; } |