diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 15:18:48 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:27 +0200 |
| commit | 0e3f38f79c62fcb6a93b7371c9b2c2cba106772c (patch) | |
| tree | 77abf25f8076e8531391e5058dca5d421911a877 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
| parent | dbe217b871e11820279d62964d8df2f16d57778c (diff) | |
Renamed QCriterion to QAnnotation
Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127
Task-number: QTBUG-41534
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index cee61165d..0ec587ed4 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -57,7 +57,7 @@ #include <Qt3DRenderer/qcameraselector.h> #include <Qt3DRenderer/qeffect.h> #include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qcriterion.h> +#include <Qt3DRenderer/qannotation.h> #include <Qt3DRenderer/qparametermapper.h> #include <Qt3DRenderer/qcuboidmesh.h> #include <Qt3DRenderer/qcylindermesh.h> @@ -111,7 +111,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // qmlRegisterCustomType<Qt3D::Effect>(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser()); qmlRegisterExtendedType<Qt3D::QEffect, Qt3D::Render::Quick::Quick3DEffect>(uri, 2, 0, "Effect"); qmlRegisterExtendedType<Qt3D::QTechnique, Qt3D::Render::Quick::Quick3DTechnique>(uri, 2, 0, "Technique"); - qmlRegisterType<Qt3D::QCriterion>(uri, 2, 0, "Criterion"); + qmlRegisterType<Qt3D::QAnnotation>(uri, 2, 0, "Annotation"); qmlRegisterType<Qt3D::QOpenGLFilter>(uri, 2, 0, "OpenGLFilter"); qmlRegisterUncreatableType<Qt3D::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only"); qmlRegisterType<Qt3D::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter"); |