summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-03-02 06:07:24 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-03-04 08:17:28 +0000
commitcd8b6ca2b6a51d4278cb93111eff1ab7b8d89121 (patch)
treef5295a10db49166f5a4bf3019a1cfba6d1cc255d /src
parentbc7afda3ece9be46bef1ac2308f3b2ce598e5f00 (diff)
Expose QComponent to QML as Component3D to avoid names clash with Quick
Change-Id: I44d91eb99f4fbcd94a7f99cf70d1c66070c15a57 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 986431b4a..23ef7cb92 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -56,7 +56,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
{
Qt3D::Quick::Quick3D_initializeProviders();
- qmlRegisterUncreatableType<Qt3D::QComponent>(uri, 2, 0, "Component", QStringLiteral(""));
+ qmlRegisterUncreatableType<Qt3D::QComponent>(uri, 2, 0, "Component3D", QStringLiteral(""));
qmlRegisterUncreatableType<Qt3D::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract"));
qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration");