summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-12-07 14:21:01 +0000
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-08 05:13:19 +0000
commitf915a9be2e6ccfd1655971edebe2ce13c8c4ab2e (patch)
tree5a70eb05a4c7b677824c3a9363c0d0e50350bb83
parent8a591a491278b76827057a51fa90ab5ee723bd75 (diff)
Fix warnings about unregistered metatypes
Task-number: QTBUG-57495 Change-Id: Ia1dc858d3c6c223498cec3644dcd8d35b7181630 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
-rw-r--r--src/input/frontend/qinputaspect.cpp3
-rw-r--r--src/render/frontend/qrenderaspect.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index 066d2381a..5c5fd3b06 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -133,6 +133,9 @@ QInputAspect::QInputAspect(QInputAspectPrivate &dd, QObject *parent)
: QAbstractAspect(dd, parent)
{
setObjectName(QStringLiteral("Input Aspect"));
+
+ qRegisterMetaType<Qt3DInput::QAbstractPhysicalDevice*>();
+
registerBackendType<QKeyboardDevice>(QBackendNodeMapperPtr(new Input::KeyboardDeviceFunctor(this, d_func()->m_inputHandler.data())));
registerBackendType<QKeyboardHandler>(QBackendNodeMapperPtr(new Input::KeyboardHandlerFunctor(d_func()->m_inputHandler.data())));
registerBackendType<QMouseDevice>(QBackendNodeMapperPtr(new Input::MouseDeviceFunctor(this, d_func()->m_inputHandler.data())));
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 1952a55c2..7e4367879 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -47,6 +47,7 @@
#include <Qt3DRender/private/geometryrenderermanager_p.h>
#include <Qt3DRender/qsceneloader.h>
+#include <Qt3DRender/qcamera.h>
#include <Qt3DRender/qcameraselector.h>
#include <Qt3DRender/qlayer.h>
#include <Qt3DRender/qlayerfilter.h>
@@ -176,6 +177,7 @@ void QRenderAspectPrivate::registerBackendTypes()
qRegisterMetaType<Qt3DRender::QBuffer*>();
qRegisterMetaType<Qt3DRender::QEffect*>();
qRegisterMetaType<Qt3DRender::QFrameGraphNode *>();
+ qRegisterMetaType<Qt3DRender::QCamera*>();
q->registerBackendType<Qt3DCore::QEntity>(QSharedPointer<Render::RenderEntityFunctor>::create(m_renderer, m_nodeManagers));
q->registerBackendType<Qt3DCore::QTransform>(QSharedPointer<Render::NodeFunctor<Render::Transform, Render::TransformManager> >::create(m_renderer, m_nodeManagers->transformManager()));