diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-09-19 08:49:20 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-09-19 09:57:17 +0200 |
| commit | 67c393315bad2ca709012a2664b11e19192c880b (patch) | |
| tree | b5383a55f9230d6409caf77e59fbcda511d8bd86 | |
| parent | 5f417b9fd3625cd229ef02a3d1a12795a58bd468 (diff) | |
QForwardRenderer: fix doc and add REVISION on clearBuffers
Task-number: QTBUG-77839
Change-Id: Idc33626c604a247044c9f682fac0f8dfc5ff3fcd
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/extras/defaults/qforwardrenderer.cpp | 2 | ||||
| -rw-r--r-- | src/extras/defaults/qforwardrenderer.h | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp index 22a471cec..dd3c872cc 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -239,11 +239,13 @@ QColor QForwardRenderer::clearColor() const \qmlproperty color ForwardRenderer::clearBuffers Holds the current buffers to be cleared. Default value is ColorDepthBuffer + \since 5.14 */ /*! \property QForwardRenderer::clearBuffers Holds the current buffers to be cleared. Default value is ColorDepthBuffer + \since 5.14 */ QClearBuffers::BufferType QForwardRenderer::clearBuffers() const { diff --git a/src/extras/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h index 6d01a0ded..0b53a094b 100644 --- a/src/extras/defaults/qforwardrenderer.h +++ b/src/extras/defaults/qforwardrenderer.h @@ -61,7 +61,7 @@ class Q_3DEXTRASSHARED_EXPORT QForwardRenderer : public Qt3DRender::QTechniqueFi Q_PROPERTY(QObject *window READ surface WRITE setSurface NOTIFY surfaceChanged) Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged) Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) - Q_PROPERTY(Qt3DRender::QClearBuffers::BufferType clearBuffers READ clearBuffers WRITE setClearBuffers NOTIFY clearBuffersChanged) + Q_PROPERTY(Qt3DRender::QClearBuffers::BufferType clearBuffers READ clearBuffers WRITE setClearBuffers NOTIFY clearBuffersChanged REVISION 14) Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(QSize externalRenderTargetSize READ externalRenderTargetSize WRITE setExternalRenderTargetSize NOTIFY externalRenderTargetSizeChanged) Q_PROPERTY(bool frustumCulling READ isFrustumCullingEnabled WRITE setFrustumCullingEnabled NOTIFY frustumCullingEnabledChanged) diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 91ec85795..b675ec283 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -87,6 +87,7 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) // Framegraphs qmlRegisterType<Qt3DExtras::QForwardRenderer>(uri, 2, 0, "ForwardRenderer"); qmlRegisterType<Qt3DExtras::QForwardRenderer, 9>(uri, 2, 9, "ForwardRenderer"); + qmlRegisterType<Qt3DExtras::QForwardRenderer, 14>(uri, 2, 14, "ForwardRenderer"); // Entities qmlRegisterType<Qt3DExtras::QSkyboxEntity>(uri, 2, 0, "SkyboxEntity"); |