diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
| commit | bf40a6cbf6b0045c157431f2717697c37bd20697 (patch) | |
| tree | 1c0ec64c7e4833d5f70f4816a55913353ed31ec9 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
| parent | d51c6983baedc283020b39062714962b6b7d0c5e (diff) | |
| parent | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 59bc0acc8..9493b59ef 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -213,6 +213,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Geometry qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute"); + qmlRegisterType<Qt3DRender::QAttribute, 10>(uri, 2, 10, "Attribute"); + qmlRegisterType<Qt3DRender::QAttribute, 11>(uri, 2, 11, "Attribute"); qmlRegisterUncreatableType<Qt3DRender::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); qmlRegisterUncreatableType<Qt3DRender::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); qmlRegisterType<Qt3DRender::Render::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer"); |