diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-20 09:48:26 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-22 10:45:34 +0200 |
| commit | 4be6e50f1af5520a989246035d3ed0ba6ab1bfd0 (patch) | |
| tree | eb9384ace93f79137b4d10c37bc84eb18f4ae48a /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
| parent | 62f9d57d8e4e9dc77f3eceb9f9c8413998143ca5 (diff) | |
QParameterMapper: renamed to QParameterMapping
Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0
Task-number: QTBUG-41535
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 9c3b2464b..ceeb6201b 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -59,7 +59,7 @@ #include <Qt3DRenderer/qeffect.h> #include <Qt3DRenderer/qparameter.h> #include <Qt3DRenderer/qannotation.h> -#include <Qt3DRenderer/qparametermapper.h> +#include <Qt3DRenderer/qparametermapping.h> #include <Qt3DRenderer/qcuboidmesh.h> #include <Qt3DRenderer/qcylindermesh.h> #include <Qt3DRenderer/qplanemesh.h> @@ -116,7 +116,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) 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"); - qmlRegisterType<Qt3D::QParameterMapper>(uri, 2, 0, "ParameterMapper"); + qmlRegisterType<Qt3D::QParameterMapping>(uri, 2, 0, "ParameterMapping"); qmlRegisterExtendedType<Qt3D::QMaterial, Qt3D::Render::Quick::Quick3DMaterial>(uri, 2, 0, "Material"); qmlRegisterExtendedType<Qt3D::QRenderPass, Qt3D::Render::Quick::Quick3DRenderPass>(uri, 2, 0, "RenderPass"); qmlRegisterType<Qt3D::QShaderProgram>(uri, 2, 0, "ShaderProgram"); |