diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-26 16:46:22 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-31 13:12:54 +0200 |
commit | 1dc9f0344aa8ebf4e8fb17e1f4a27d7a087291e4 (patch) | |
tree | 873dfd013e4bb63428e373d4f9d13b241c1d4e68 /src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | |
parent | 0937038a810c922325db8adb3f71b08a9c72b0a5 (diff) |
Material references a QAbstractEffect instead of a Node
The Effect element is now expected to be a QAbstractEffect instead of a
Node. This ensures that the user can only register a subclass of
QAbstractEffect as a Material's Effect.
Change-Id: I25a316343475f34846590cee600a9477945bdee3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp')
-rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 640e06182..20326fcc5 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -50,12 +50,14 @@ #include <Qt3DCore/matrixtransform.h> #include <Qt3DCore/translatetransform.h> #include <Qt3DCore/rotatetransform.h> +#include <Qt3DCore/qabstracteffect.h> QT_BEGIN_NAMESPACE void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<Qt3D::Node>(uri, 2, 0, "Node_priv", ""); + qmlRegisterInterface<Qt3D::QAbstractEffect>("QAbstractEffect"); qmlRegisterType<Qt3D::Component>(uri, 2, 0, "Component"); qmlRegisterType<Qt3D::Camera>(uri, 2, 0, "Camera"); qmlRegisterType<Qt3D::CameraLens>(uri, 2, 0, "CameraLens"); |