Rename QClearBuffer to QClearBuffers

Task-number: QTBUG-51460
Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

36 files changed, 162 insertions, 162 deletions

diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
index f48a066b9..ebe4bbadd 100644
--- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
+++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
@@ -62,8 +62,8 @@ Viewport {
 
         // ColorMask is reset by default
         // By default reset to the default if not specified
-        ClearBuffer {
-            buffers: ClearBuffer.ColorDepthBuffer
+        ClearBuffers {
+            buffers: ClearBuffers.ColorDepthBuffer
             NoDraw {} // We just want to clear the buffers
         }
 
@@ -79,8 +79,8 @@ Viewport {
         }
 
         // Draw with right eye
-        ClearBuffer {
-            buffers: ClearBuffer.DepthBuffer
+        ClearBuffers {
+            buffers: ClearBuffers.DepthBuffer
             CameraSelector {
                 id: rightCameraSelector
                 RenderStateSet {
diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
index 50b9e4102..69ec41598 100644
--- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
+++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
@@ -75,8 +75,8 @@ Viewport {
                     // Render entities with their regular material
                     // Fills depth buffer for entities that are clipped
                     layers: ["content", "visualization"]
-                    ClearBuffer {
-                        buffers: ClearBuffer.ColorDepthBuffer
+                    ClearBuffers {
+                        buffers: ClearBuffers.ColorDepthBuffer
                         RenderPassFilter {
                             includes: FilterKey { name: "pass"; value: "material" }
                         }
@@ -84,9 +84,9 @@ Viewport {
                 }
 
                 // Branch 2
-                ClearBuffer {
+                ClearBuffers {
                     // Enable and fill Stencil to later generate caps
-                    buffers: ClearBuffer.StencilBuffer
+                    buffers: ClearBuffers.StencilBuffer
                     RenderStateSet {
                         // Disable depth culling
                         // Incr for back faces
diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
index 0cd43f6d2..9a84f246f 100644
--- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml
+++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml
@@ -58,8 +58,8 @@ Viewport {
         id: surfaceSelector
 
         // Clear Buffer
-        ClearBuffer {
-            buffers: ClearBuffer.ColorDepthBuffer
+        ClearBuffers {
+            buffers: ClearBuffers.ColorDepthBuffer
             NoDraw {}
         }
 
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 575be946a..e93c417ee 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -71,7 +71,7 @@
 #include <Qt3DRender/qtechniquefilter.h>
 #include <Qt3DRender/qviewport.h>
 #include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include "qt3dwindow.h"
 #include "qfirstpersoncameracontroller.h"
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index 5981de9ed..394d30f7b 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -56,15 +56,15 @@ DeferredRenderer::DeferredRenderer(Qt3DCore::QNode *parent)
     , m_surfaceSelector(new Qt3DRender::QRenderSurfaceSelector(this))
     , m_sceneFilter(new Qt3DRender::QLayerFilter(m_surfaceSelector))
     , m_screenQuadFilter(new Qt3DRender::QLayerFilter(m_surfaceSelector))
-    , m_clearScreenQuad(new Qt3DRender::QClearBuffer(m_screenQuadFilter))
+    , m_clearScreenQuad(new Qt3DRender::QClearBuffers(m_screenQuadFilter))
     , m_gBufferTargetSelector(new Qt3DRender::QRenderTargetSelector(m_sceneFilter))
-    , m_clearGBuffer(new Qt3DRender::QClearBuffer(m_gBufferTargetSelector))
+    , m_clearGBuffer(new Qt3DRender::QClearBuffers(m_gBufferTargetSelector))
     , m_geometryPassFilter(new Qt3DRender::QRenderPassFilter(m_clearGBuffer))
     , m_finalPassFilter(new Qt3DRender::QRenderPassFilter(m_clearScreenQuad))
     , m_sceneCameraSelector(new Qt3DRender::QCameraSelector(m_geometryPassFilter))
 {
-    m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
-    m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
+    m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer);
+    m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer);
 }
 
 void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera)
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 8f37d4b5a..fa716ee7d 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -52,7 +52,7 @@
 #define DEFERREDRENDERER_H
 
 #include <Qt3DRender/QViewport>
-#include <Qt3DRender/QClearBuffer>
+#include <Qt3DRender/QClearBuffers>
 #include <Qt3DRender/QLayerFilter>
 #include <Qt3DRender/QRenderPassFilter>
 #include <Qt3DRender/QRenderTargetSelector>
@@ -76,9 +76,9 @@ private:
     Qt3DRender::QRenderSurfaceSelector *m_surfaceSelector;
     Qt3DRender::QLayerFilter *m_sceneFilter;
     Qt3DRender::QLayerFilter *m_screenQuadFilter;
-    Qt3DRender::QClearBuffer *m_clearScreenQuad;
+    Qt3DRender::QClearBuffers *m_clearScreenQuad;
     Qt3DRender::QRenderTargetSelector *m_gBufferTargetSelector;
-    Qt3DRender::QClearBuffer *m_clearGBuffer;
+    Qt3DRender::QClearBuffers *m_clearGBuffer;
     Qt3DRender::QRenderPassFilter *m_geometryPassFilter;
     Qt3DRender::QRenderPassFilter *m_finalPassFilter;
     Qt3DRender::QCameraSelector *m_sceneCameraSelector;
diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
index 6b87d468f..8b7d35009 100644
--- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
@@ -64,8 +64,8 @@ Viewport {
             RenderTargetSelector {
                 id : gBufferTargetSelector
 
-                ClearBuffer {
-                    buffers: ClearBuffer.ColorDepthBuffer
+                ClearBuffers {
+                    buffers: ClearBuffers.ColorDepthBuffer
 
                     RenderPassFilter {
                         id : geometryPass
@@ -82,8 +82,8 @@ Viewport {
         LayerFilter {
             layers : "screenQuad"
 
-            ClearBuffer {
-                buffers: ClearBuffer.ColorDepthBuffer
+            ClearBuffers {
+                buffers: ClearBuffers.ColorDepthBuffer
 
                 RenderPassFilter {
                     id : finalPass
diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml
index e48f53a47..84c420afc 100644
--- a/examples/qt3d/enabled-qml/main.qml
+++ b/examples/qt3d/enabled-qml/main.qml
@@ -65,8 +65,8 @@ Entity {
 
                 RenderSurfaceSelector {
 
-                    ClearBuffer {
-                        buffers : ClearBuffer.ColorDepthBuffer
+                    ClearBuffers {
+                        buffers : ClearBuffers.ColorDepthBuffer
                         enabled: counter !== 6
                     }
 
diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml
index 3d4cc4f4e..5d34890ea 100644
--- a/examples/qt3d/gltf/main.qml
+++ b/examples/qt3d/gltf/main.qml
@@ -75,8 +75,8 @@ Entity {
             clearColor: "black"
             CameraSelector {
                 camera: camera
-                ClearBuffer {
-                    buffers : ClearBuffer.ColorDepthBuffer
+                ClearBuffers {
+                    buffers : ClearBuffers.ColorDepthBuffer
                     SortPolicy {
                         criteria: [
                             SortCriterion { sort: SortCriterion.BackToFront }
diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml
index ba2922e90..6b42d28ea 100644
--- a/examples/qt3d/materials/SortedForwardRenderer.qml
+++ b/examples/qt3d/materials/SortedForwardRenderer.qml
@@ -76,8 +76,8 @@ TechniqueFilter {
             CameraSelector {
                 id : cameraSelector
                 objectName : "cameraSelector"
-                ClearBuffer {
-                    buffers : ClearBuffer.ColorDepthBuffer
+                ClearBuffers {
+                    buffers : ClearBuffers.ColorDepthBuffer
                     SortPolicy {
                         criteria: [
                             SortCriterion { sort: SortCriterion.StateChangeCost },
diff --git a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
index a6cd2bc21..2fb8474ad 100644
--- a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
+++ b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
@@ -67,8 +67,8 @@ RenderSettings {
             id: mainViewport
             normalizedRect: Qt.rect(0, 0, 1, 1)
 
-            ClearBuffer {
-                buffers: ClearBuffer.ColorDepthBuffer
+            ClearBuffers {
+                buffers: ClearBuffers.ColorDepthBuffer
             }
 
             Viewport {
diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml
index e0b446449..bc0bf82ba 100644
--- a/examples/qt3d/picking-qml/main.qml
+++ b/examples/qt3d/picking-qml/main.qml
@@ -95,8 +95,8 @@ Entity {
                 normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0)
 
                 RenderSurfaceSelector {
-                    ClearBuffer {
-                        buffers : ClearBuffer.ColorDepthBuffer
+                    ClearBuffers {
+                        buffers : ClearBuffers.ColorDepthBuffer
                         NoDraw {}
                     }
 
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index d575637d4..267cc6036 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -95,8 +95,8 @@ RenderSettings {
                         ]
                     }
 
-                    ClearBuffer {
-                        buffers: ClearBuffer.DepthBuffer
+                    ClearBuffers {
+                        buffers: ClearBuffers.DepthBuffer
 
                         CameraSelector {
                             id: lightCameraSelector
@@ -109,8 +109,8 @@ RenderSettings {
         RenderPassFilter {
             includes: [ FilterKey { name: "pass"; value: "forward" } ]
 
-            ClearBuffer {
-                buffers: ClearBuffer.ColorDepthBuffer
+            ClearBuffers {
+                buffers: ClearBuffers.ColorDepthBuffer
 
                 CameraSelector {
                     id: viewCameraSelector
diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index ccbdc8536..3be14e0e4 100644
--- a/examples/qt3d/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
@@ -73,8 +73,8 @@ TechniqueFilter {
         FilterKey { name: "Enabled"; value: true;}
     ]
 
-    ClearBuffer {
-        buffers: ClearBuffer.ColorDepthBuffer
+    ClearBuffers {
+        buffers: ClearBuffers.ColorDepthBuffer
 
         // Main Viewport
         Viewport {
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 2a510b40b..302b10af5 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -92,8 +92,8 @@ RenderSettings {
                         ]
                     }
 
-                    ClearBuffer {
-                        buffers: ClearBuffer.DepthBuffer
+                    ClearBuffers {
+                        buffers: ClearBuffers.DepthBuffer
 
                         CameraSelector {
                             id: lightCameraSelector
@@ -105,8 +105,8 @@ RenderSettings {
         RenderPassFilter {
             includes: [ FilterKey { name: "pass"; value: "forward" } ]
 
-                ClearBuffer {
-                    buffers: ClearBuffer.ColorDepthBuffer
+                ClearBuffers {
+                    buffers: ClearBuffers.ColorDepthBuffer
 
                     CameraSelector {
                         id: viewCameraSelector
diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml
index 660633c23..bee266efd 100644
--- a/examples/qt3d/wave/WaveForwardRenderer.qml
+++ b/examples/qt3d/wave/WaveForwardRenderer.qml
@@ -73,8 +73,8 @@ TechniqueFilter {
             CameraSelector {
                 id: cameraSelector
 
-                ClearBuffer {
-                    buffers: ClearBuffer.ColorDepthBuffer
+                ClearBuffers {
+                    buffers: ClearBuffers.ColorDepthBuffer
                     LayerFilter { layers: "background" }
                 }
 
diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
index 646e787e6..97d755503 100644
--- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
+++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
@@ -63,8 +63,8 @@ TechniqueFilter {
             CameraSelector {
                 id : cameraSelector
                 FrustumCulling {
-                    ClearBuffer {
-                        buffers : ClearBuffer.ColorDepthBuffer
+                    ClearBuffers {
+                        buffers : ClearBuffers.ColorDepthBuffer
                     }
                 }
             }
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 04a522a5c..98950e47c 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -80,7 +80,7 @@
 #include <Qt3DRender/qscissortest.h>
 #include <Qt3DRender/qdithering.h>
 #include <Qt3DRender/qrendertargetoutput.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include <Qt3DRender/qsortcriterion.h>
 #include <Qt3DRender/qalphacoverage.h>
 #include <Qt3DRender/qpointsize.h>
@@ -268,7 +268,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechniqueFilter, Qt3DRender::Render::Quick::Quick3DTechniqueFilter>("QTechniqueFilter", "Qt3D.Render/TechniqueFilter", uri, 2, 0, "TechniqueFilter");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QViewport, Qt3DRender::Render::Quick::Quick3DViewport>("QViewport", "Qt3D.Render/Viewport", uri, 2, 0, "Viewport");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTargetSelector, Qt3DRender::Render::Quick::Quick3DRenderTargetSelector>("QRenderTargetSelector", "Qt3D.Render/RenderTargetSelector", uri, 2, 0, "RenderTargetSelector");
-    qmlRegisterType<Qt3DRender::QClearBuffer>(uri, 2, 0, "ClearBuffer");
+    qmlRegisterType<Qt3DRender::QClearBuffers>(uri, 2, 0, "ClearBuffers");
     qmlRegisterUncreatableType<Qt3DRender::QFrameGraphNode>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class"));
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderStateSet, Qt3DRender::Render::Quick::Quick3DStateSet>("QRenderStateSet", "Qt3D.Render/RenderStateSet", uri, 2, 0, "RenderStateSet");
     qmlRegisterType<Qt3DRender::QNoDraw>(uri, 2, 0, "NoDraw");
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 186d20151..a96054c06 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -288,7 +288,7 @@ RenderView::RenderView()
     , m_clearColor(Q_NULLPTR)
     , m_viewport(Q_NULLPTR)
     , m_surface(Q_NULLPTR)
-    , m_clearBuffer(QClearBuffer::None)
+    , m_clearBuffer(QClearBuffers::None)
     , m_stateSet(Q_NULLPTR)
     , m_noDraw(false)
     , m_compute(false)
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index a27f1edb5..44bdfee58 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -53,7 +53,7 @@
 //
 
 #include <Qt3DRender/qparameter.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DRender/private/cameralens_p.h>
 #include <Qt3DRender/private/attachmentpack_p.h>
@@ -218,8 +218,8 @@ public:
         return *m_clearColor;
     }
 
-    inline void setClearBuffer(QClearBuffer::BufferType clearBuffer) Q_DECL_NOEXCEPT { m_clearBuffer = clearBuffer; }
-    inline QClearBuffer::BufferType clearBuffer() const Q_DECL_NOEXCEPT { return m_clearBuffer; }
+    inline void setClearBuffer(QClearBuffers::BufferType clearBuffer) Q_DECL_NOEXCEPT { m_clearBuffer = clearBuffer; }
+    inline QClearBuffers::BufferType clearBuffer() const Q_DECL_NOEXCEPT { return m_clearBuffer; }
 
     RenderRenderPassList passesAndParameters(ParameterInfoList *parameter, Entity *node, bool useDefaultMaterials = true);
 
@@ -289,7 +289,7 @@ private:
     HTarget m_renderTarget;
     QSurface *m_surface;
     AttachmentPack m_attachmentPack;
-    QClearBuffer::BufferType m_clearBuffer;
+    QClearBuffers::BufferType m_clearBuffer;
     RenderStateSet *m_stateSet;
     bool m_noDraw:1;
     bool m_compute:1;
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index cfd68f3dc..3a652f817 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -42,7 +42,7 @@
 
 #include <Qt3DRender/qviewport.h>
 #include <Qt3DRender/qcameraselector.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qfrustumculling.h>
 #include <Qt3DRender/qrendersurfaceselector.h>
@@ -56,7 +56,7 @@ QForwardRendererPrivate::QForwardRendererPrivate()
     , m_surfaceSelector(new QRenderSurfaceSelector)
     , m_viewport(new QViewport())
     , m_cameraSelector(new QCameraSelector())
-    , m_clearBuffer(new QClearBuffer())
+    , m_clearBuffer(new QClearBuffers())
     , m_frustumCulling(new QFrustumCulling())
 {
 }
@@ -73,7 +73,7 @@ void QForwardRendererPrivate::init()
 
     m_viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
     m_viewport->setClearColor(Qt::white);
-    m_clearBuffer->setBuffers(QClearBuffer::ColorDepthBuffer);
+    m_clearBuffer->setBuffers(QClearBuffers::ColorDepthBuffer);
 
     QFilterKey *forwardRenderingStyle = new QFilterKey(q);
     forwardRenderingStyle->setName(QStringLiteral("renderingStyle"));
@@ -92,7 +92,7 @@ void QForwardRendererPrivate::init()
 
     Internally the Qt3DRender::QForwardRenderer is a subclass of Qt3DRender::QTechniqueFilter.
     This a is a single leaf Framegraph tree which contains a Qt3DRender::QViewport, a Qt3DRender::QCameraSelector
-    and a Qt3DRender::QClearBuffer.
+    and a Qt3DRender::QClearBuffers.
     The Qt3DRender::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
     If you need to filter out your techniques, you should do so based on that annotation.
 
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index 387ce655b..5e5e6f696 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 
 class QForwardRenderer;
 class QViewport;
-class QClearBuffer;
+class QClearBuffers;
 class QCameraSelector;
 class QFrustumCulling;
 class QRenderSurfaceSelector;
@@ -72,7 +72,7 @@ public:
     QRenderSurfaceSelector *m_surfaceSelector;
     QViewport *m_viewport;
     QCameraSelector *m_cameraSelector;
-    QClearBuffer *m_clearBuffer;
+    QClearBuffers *m_clearBuffer;
     QFrustumCulling *m_frustumCulling;
 
     void init();
diff --git a/src/render/framegraph/clearbuffer.cpp b/src/render/framegraph/clearbuffers.cpp
index d74a2d383..41f9d563e 100644
--- a/src/render/framegraph/clearbuffer.cpp
+++ b/src/render/framegraph/clearbuffers.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "clearbuffer_p.h"
+#include "clearbuffers_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -47,32 +47,32 @@ using namespace Qt3DCore;
 namespace Qt3DRender {
 namespace Render {
 
-ClearBuffer::ClearBuffer()
-    : FrameGraphNode(FrameGraphNode::ClearBuffer)
-    , m_type(QClearBuffer::None)
+ClearBuffers::ClearBuffers()
+    : FrameGraphNode(FrameGraphNode::ClearBuffers)
+    , m_type(QClearBuffers::None)
 {
 }
 
-void ClearBuffer::updateFromPeer(Qt3DCore::QNode *peer)
+void ClearBuffers::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer);
-    m_type = clearBuffer->buffers();
-    setEnabled(clearBuffer->isEnabled());
+    QClearBuffers *clearBuffers = static_cast<QClearBuffers *>(peer);
+    m_type = clearBuffers->buffers();
+    setEnabled(clearBuffers->isEnabled());
 }
 
-void ClearBuffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void ClearBuffers::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("buffers"))
-            m_type = static_cast<QClearBuffer::BufferType>(propertyChange->value().toInt());
+            m_type = static_cast<QClearBuffers::BufferType>(propertyChange->value().toInt());
         else if (propertyChange->propertyName() == QByteArrayLiteral("enabled"))
             setEnabled(propertyChange->value().toBool());
         markDirty(AbstractRenderer::AllDirty);
     }
 }
 
-QClearBuffer::BufferType ClearBuffer::type() const
+QClearBuffers::BufferType ClearBuffers::type() const
 {
     return m_type;
 }
diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffers_p.h
index 892bc1eb2..eca512a0b 100644
--- a/src/render/framegraph/clearbuffer_p.h
+++ b/src/render/framegraph/clearbuffers_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_CLEARBUFFER_P_H
-#define QT3DRENDER_RENDER_CLEARBUFFER_P_H
+#ifndef QT3DRENDER_RENDER_CLEARBUFFERS_P_H
+#define QT3DRENDER_RENDER_CLEARBUFFERS_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DRender/private/framegraphnode_p.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,17 +62,17 @@ namespace Render {
 
 class FrameGraphManager;
 
-class ClearBuffer : public FrameGraphNode
+class ClearBuffers : public FrameGraphNode
 {
 public:
-    ClearBuffer();
+    ClearBuffers();
 
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    QClearBuffer::BufferType type() const;
+    QClearBuffers::BufferType type() const;
 
 private:
-    QClearBuffer::BufferType m_type;
+    QClearBuffers::BufferType m_type;
 };
 
 } // namespace Render
@@ -81,4 +81,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_CLEARBUFFER_P_H
+#endif // QT3DRENDER_RENDER_CLEARBUFFERS_P_H
diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri
index b61815b9e..f7618e065 100644
--- a/src/render/framegraph/framegraph.pri
+++ b/src/render/framegraph/framegraph.pri
@@ -2,15 +2,15 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/cameraselectornode_p.h \
-    $$PWD/clearbuffer_p.h \
+    $$PWD/clearbuffers_p.h \
     $$PWD/framegraphnode_p.h \
     $$PWD/framegraphvisitor_p.h \
     $$PWD/layerfilternode_p.h \
     $$PWD/nodraw_p.h \
     $$PWD/qcameraselector.h \
     $$PWD/qcameraselector_p.h \
-    $$PWD/qclearbuffer.h \
-    $$PWD/qclearbuffer_p.h \
+    $$PWD/qclearbuffers.h \
+    $$PWD/qclearbuffers_p.h \
     $$PWD/qframegraphnode.h \
     $$PWD/qframegraphnode_p.h \
     $$PWD/qlayerfilter.h \
@@ -50,13 +50,13 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/cameraselectornode.cpp \
-    $$PWD/clearbuffer.cpp \
+    $$PWD/clearbuffers.cpp \
     $$PWD/framegraphnode.cpp \
     $$PWD/framegraphvisitor.cpp \
     $$PWD/layerfilternode.cpp \
     $$PWD/nodraw.cpp \
     $$PWD/qcameraselector.cpp \
-    $$PWD/qclearbuffer.cpp \
+    $$PWD/qclearbuffers.cpp \
     $$PWD/qframegraphnode.cpp \
     $$PWD/qlayerfilter.cpp \
     $$PWD/qnodraw.cpp \
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index b79563136..5d49643e7 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -81,7 +81,7 @@ public:
         RenderTarget,
         TechniqueFilter,
         Viewport,
-        ClearBuffer,
+        ClearBuffers,
         SortMethod,
         SubtreeSelector,
         StateSet,
diff --git a/src/render/framegraph/qclearbuffer.cpp b/src/render/framegraph/qclearbuffers.cpp
index 80a6a418c..d0c323086 100644
--- a/src/render/framegraph/qclearbuffer.cpp
+++ b/src/render/framegraph/qclearbuffers.cpp
@@ -37,53 +37,53 @@
 **
 ****************************************************************************/
 
-#include "qclearbuffer.h"
-#include <private/qclearbuffer_p.h>
+#include "qclearbuffers.h"
+#include <private/qclearbuffers_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-QClearBufferPrivate::QClearBufferPrivate()
+QClearBuffersPrivate::QClearBuffersPrivate()
     : QFrameGraphNodePrivate()
-    , m_buffersType(QClearBuffer::None)
+    , m_buffersType(QClearBuffers::None)
 {
 }
 
-void QClearBuffer::copy(const QNode *ref)
+void QClearBuffers::copy(const QNode *ref)
 {
     QFrameGraphNode::copy(ref);
-    const QClearBuffer *b = static_cast<const QClearBuffer*>(ref);
+    const QClearBuffers *b = static_cast<const QClearBuffers*>(ref);
     d_func()->m_buffersType = b->d_func()->m_buffersType;
 }
 
-QClearBuffer::QClearBuffer(QNode *parent)
-    : QFrameGraphNode(*new QClearBufferPrivate, parent)
+QClearBuffers::QClearBuffers(QNode *parent)
+    : QFrameGraphNode(*new QClearBuffersPrivate, parent)
 {
 }
 
-QClearBuffer::~QClearBuffer()
+QClearBuffers::~QClearBuffers()
 {
     QNode::cleanup();
 }
 
 /*! \internal */
-QClearBuffer::QClearBuffer(QClearBufferPrivate &dd, QNode *parent)
+QClearBuffers::QClearBuffers(QClearBuffersPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
 {
 }
 
 
-QClearBuffer::BufferType QClearBuffer::buffers() const
+QClearBuffers::BufferType QClearBuffers::buffers() const
 {
-    Q_D(const QClearBuffer);
+    Q_D(const QClearBuffers);
     return d->m_buffersType;
 }
 
-void QClearBuffer::setBuffers(QClearBuffer::BufferType buffers)
+void QClearBuffers::setBuffers(QClearBuffers::BufferType buffers)
 {
-    Q_D(QClearBuffer);
+    Q_D(QClearBuffers);
     if (d->m_buffersType != buffers) {
         d->m_buffersType = buffers;
         emit buffersChanged(buffers);
diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffers.h
index da414064c..9a145d0b0 100644
--- a/src/render/framegraph/qclearbuffer.h
+++ b/src/render/framegraph/qclearbuffers.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QCLEARBUFFER_H
-#define QT3DRENDER_QCLEARBUFFER_H
+#ifndef QT3DRENDER_QCLEARBUFFERS_H
+#define QT3DRENDER_QCLEARBUFFERS_H
 
 #include <Qt3DRender/qframegraphnode.h>
 
@@ -46,15 +46,15 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QClearBufferPrivate;
+class QClearBuffersPrivate;
 
-class QT3DRENDERSHARED_EXPORT QClearBuffer : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged)
 public:
-    explicit QClearBuffer(Qt3DCore::QNode *parent = 0);
-    ~QClearBuffer();
+    explicit QClearBuffers(Qt3DCore::QNode *parent = 0);
+    ~QClearBuffers();
 
     enum BufferType {
         None = 0,
@@ -77,16 +77,16 @@ Q_SIGNALS:
     void buffersChanged(BufferType buffers);
 
 protected:
-    QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QClearBuffers(QClearBuffersPrivate &dd, Qt3DCore::QNode *parent = 0);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QClearBuffer)
-    QT3D_CLONEABLE(QClearBuffer)
+    Q_DECLARE_PRIVATE(QClearBuffers)
+    QT3D_CLONEABLE(QClearBuffers)
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QCLEARBUFFER_H
+#endif // QT3DRENDER_QCLEARBUFFERS_H
diff --git a/src/render/framegraph/qclearbuffer_p.h b/src/render/framegraph/qclearbuffers_p.h
index 9634cfd23..69fc62e4d 100644
--- a/src/render/framegraph/qclearbuffer_p.h
+++ b/src/render/framegraph/qclearbuffers_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QCLEARBUFFER_P_H
-#define QT3DRENDER_QCLEARBUFFER_P_H
+#ifndef QT3DRENDER_QCLEARBUFFERS_P_H
+#define QT3DRENDER_QCLEARBUFFERS_P_H
 
 //
 //  W A R N I N G
@@ -52,23 +52,23 @@
 //
 
 #include <private/qframegraphnode_p.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QClearBufferPrivate : public QFrameGraphNodePrivate
+class QClearBuffersPrivate : public QFrameGraphNodePrivate
 {
 public:
-    QClearBufferPrivate();
+    QClearBuffersPrivate();
 
-    Q_DECLARE_PUBLIC(QClearBuffer)
-    QClearBuffer::BufferType m_buffersType;
+    Q_DECLARE_PUBLIC(QClearBuffers)
+    QClearBuffers::BufferType m_buffersType;
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QCLEARBUFFER_P_H
+#endif // QT3DRENDER_QCLEARBUFFERS_P_H
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index eb223eeaa..9dc9a9ed9 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -58,7 +58,7 @@
 #include <Qt3DRender/qtechniquefilter.h>
 #include <Qt3DRender/qviewport.h>
 #include <Qt3DRender/qrendertarget.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qshaderdata.h>
@@ -91,7 +91,7 @@
 #include <Qt3DRender/private/viewportnode_p.h>
 #include <Qt3DRender/private/rendertarget_p.h>
 #include <Qt3DRender/private/scenemanager_p.h>
-#include <Qt3DRender/private/clearbuffer_p.h>
+#include <Qt3DRender/private/clearbuffers_p.h>
 #include <Qt3DRender/private/sortpolicy_p.h>
 #include <Qt3DRender/private/sortcriterion_p.h>
 #include <Qt3DRender/private/renderlogging_p.h>
@@ -196,7 +196,7 @@ void QRenderAspectPrivate::registerBackendTypes()
     q->registerBackendType<QRenderTarget>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderTarget, Render::RenderTargetManager>(m_renderer, m_nodeManagers->renderTargetManager())));
     q->registerBackendType<QRenderTargetOutput>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderTargetOutput, Render::AttachmentManager>(m_renderer, m_nodeManagers->attachmentManager())));
     q->registerBackendType<QSortCriterion>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::SortCriterion, Render::SortCriterionManager>(m_renderer, m_nodeManagers->sortCriterionManager())));
-    q->registerBackendType<QClearBuffer>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::ClearBuffer, QClearBuffer>(m_renderer, m_nodeManagers->frameGraphManager())));
+    q->registerBackendType<QClearBuffers>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::ClearBuffers, QClearBuffers>(m_renderer, m_nodeManagers->frameGraphManager())));
     q->registerBackendType<QTechniqueFilter>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::TechniqueFilter, QTechniqueFilter>(m_renderer, m_nodeManagers->frameGraphManager())));
     q->registerBackendType<QViewport>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::ViewportNode, QViewport>(m_renderer, m_nodeManagers->frameGraphManager())));
     q->registerBackendType<QRenderPassFilter>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::RenderPassFilter, QRenderPassFilter>(m_renderer, m_nodeManagers->frameGraphManager())));
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index 16ed5c7dd..ce10a25f3 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -225,16 +225,16 @@ bool GraphicsContext::beginDrawing(QSurface *surface, const QColor &color)
     return true;
 }
 
-void GraphicsContext::clearBackBuffer(QClearBuffer::BufferType buffers)
+void GraphicsContext::clearBackBuffer(QClearBuffers::BufferType buffers)
 {
-    if (buffers != QClearBuffer::None) {
+    if (buffers != QClearBuffers::None) {
         GLbitfield mask = 0;
 
-        if (buffers & QClearBuffer::ColorBuffer)
+        if (buffers & QClearBuffers::ColorBuffer)
             mask |= GL_COLOR_BUFFER_BIT;
-        if (buffers & QClearBuffer::DepthBuffer)
+        if (buffers & QClearBuffers::DepthBuffer)
             mask |= GL_DEPTH_BUFFER_BIT;
-        if (buffers & QClearBuffer::StencilBuffer)
+        if (buffers & QClearBuffers::StencilBuffer)
             mask |= GL_STENCIL_BUFFER_BIT;
 
         m_gl->functions()->glClear(mask);
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index ca5f43c7a..ddf01ce0c 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -60,7 +60,7 @@
 #include <QMatrix4x4>
 #include <QBitArray>
 #include <Qt3DRender/private/quniformvalue_p.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 #include <Qt3DRender/private/shader_p.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/private/handle_types_p.h>
@@ -107,7 +107,7 @@ public:
     int id() const; // unique, small integer ID of this context
 
     bool beginDrawing(QSurface *surface, const QColor &color);
-    void clearBackBuffer(QClearBuffer::BufferType buffers);
+    void clearBackBuffer(QClearBuffers::BufferType buffers);
     void endDrawing(bool swapBuffers);
 
     void setViewport(const QRectF &viewport, const QSize &surfaceSize);
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 0ef7f41cc..dde0b7184 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DRender/qshaderdata.h>
 
 #include <Qt3DRender/private/cameraselectornode_p.h>
-#include <Qt3DRender/private/clearbuffer_p.h>
+#include <Qt3DRender/private/clearbuffers_p.h>
 #include <Qt3DRender/private/layerfilternode_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DRender/private/effect_p.h>
@@ -152,8 +152,8 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
                 break;
             }
 
-            case FrameGraphNode::ClearBuffer:
-                rv->setClearBuffer(static_cast<const ClearBuffer *>(node)->type());
+            case FrameGraphNode::ClearBuffers:
+                rv->setClearBuffer(static_cast<const ClearBuffers *>(node)->type());
                 break;
 
             case FrameGraphNode::TechniqueFilter:
diff --git a/tests/auto/render/qclearbuffer/qclearbuffer.pro b/tests/auto/render/qclearbuffers/qclearbuffers.pro
index e85e481f3..fdd10d392 100644
--- a/tests/auto/render/qclearbuffer/qclearbuffer.pro
+++ b/tests/auto/render/qclearbuffers/qclearbuffers.pro
@@ -6,6 +6,6 @@ QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
 
 CONFIG += testcase
 
-SOURCES += tst_qclearbuffer.cpp
+SOURCES += tst_qclearbuffers.cpp
 
 include(../commons/commons.pri)
diff --git a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp
index b363a5b99..e90f77204 100644
--- a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp
+++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp
@@ -30,17 +30,17 @@
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
 
 #include "testpostmanarbiter.h"
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QClearBuffer: public Qt3DCore::QNode
+class tst_QClearBuffers: public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
-    ~tst_QClearBuffer()
+    ~tst_QClearBuffers()
     {
         QNode::cleanup();
     }
@@ -49,54 +49,54 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3DRender::QClearBuffer *>("clearBuffer");
-        QTest::addColumn<Qt3DRender::QClearBuffer::BufferType>("bufferType");
+        QTest::addColumn<Qt3DRender::QClearBuffers *>("clearBuffers");
+        QTest::addColumn<Qt3DRender::QClearBuffers::BufferType>("bufferType");
 
-        Qt3DRender::QClearBuffer *defaultConstructed = new Qt3DRender::QClearBuffer();
-        QTest::newRow("defaultConstructed") << defaultConstructed << Qt3DRender::QClearBuffer::None;
+        Qt3DRender::QClearBuffers *defaultConstructed = new Qt3DRender::QClearBuffers();
+        QTest::newRow("defaultConstructed") << defaultConstructed << Qt3DRender::QClearBuffers::None;
 
-        Qt3DRender::QClearBuffer *allBuffers = new Qt3DRender::QClearBuffer();
-        allBuffers->setBuffers(Qt3DRender::QClearBuffer::AllBuffers);
-        QTest::newRow("allBuffers") << allBuffers << Qt3DRender::QClearBuffer::AllBuffers;
+        Qt3DRender::QClearBuffers *allBuffers = new Qt3DRender::QClearBuffers();
+        allBuffers->setBuffers(Qt3DRender::QClearBuffers::AllBuffers);
+        QTest::newRow("allBuffers") << allBuffers << Qt3DRender::QClearBuffers::AllBuffers;
 
-        Qt3DRender::QClearBuffer *depthBuffer = new Qt3DRender::QClearBuffer();
-        depthBuffer->setBuffers(Qt3DRender::QClearBuffer::DepthBuffer);
-        QTest::newRow("depthBuffer") << depthBuffer << Qt3DRender::QClearBuffer::DepthBuffer;
+        Qt3DRender::QClearBuffers *depthBuffer = new Qt3DRender::QClearBuffers();
+        depthBuffer->setBuffers(Qt3DRender::QClearBuffers::DepthBuffer);
+        QTest::newRow("depthBuffer") << depthBuffer << Qt3DRender::QClearBuffers::DepthBuffer;
 
-        Qt3DRender::QClearBuffer *colorDepthBuffer = new Qt3DRender::QClearBuffer();
-        colorDepthBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
-        QTest::newRow("colorDepthBuffer") << colorDepthBuffer << Qt3DRender::QClearBuffer::ColorDepthBuffer;
+        Qt3DRender::QClearBuffers *colorDepthBuffer = new Qt3DRender::QClearBuffers();
+        colorDepthBuffer->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer);
+        QTest::newRow("colorDepthBuffer") << colorDepthBuffer << Qt3DRender::QClearBuffers::ColorDepthBuffer;
     }
 
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3DRender::QClearBuffer *, clearBuffer);
-        QFETCH(Qt3DRender::QClearBuffer::BufferType, bufferType);
+        QFETCH(Qt3DRender::QClearBuffers *, clearBuffers);
+        QFETCH(Qt3DRender::QClearBuffers::BufferType, bufferType);
 
         // THEN
-        QCOMPARE(clearBuffer->buffers(), bufferType);
+        QCOMPARE(clearBuffers->buffers(), bufferType);
 
         // WHEN
-        Qt3DRender::QClearBuffer *clone = static_cast<Qt3DRender::QClearBuffer *>(QNode::clone(clearBuffer));
+        Qt3DRender::QClearBuffers *clone = static_cast<Qt3DRender::QClearBuffers *>(QNode::clone(clearBuffers));
 
         // THEN
         QVERIFY(clone != Q_NULLPTR);
-        QCOMPARE(clearBuffer->id(), clone->id());
-        QCOMPARE(clearBuffer->buffers(), clone->buffers());
+        QCOMPARE(clearBuffers->id(), clone->id());
+        QCOMPARE(clearBuffers->buffers(), clone->buffers());
 
-        delete clearBuffer;
+        delete clearBuffers;
         delete clone;
     }
 
     void checkPropertyUpdates()
     {
         // GIVEN
-        QScopedPointer<Qt3DRender::QClearBuffer> clearBuffer(new Qt3DRender::QClearBuffer());
+        QScopedPointer<Qt3DRender::QClearBuffers> clearBuffer(new Qt3DRender::QClearBuffers());
         TestArbiter arbiter(clearBuffer.data());
 
         // WHEN
-        clearBuffer->setBuffers(Qt3DRender::QClearBuffer::AllBuffers);
+        clearBuffer->setBuffers(Qt3DRender::QClearBuffers::AllBuffers);
         QCoreApplication::processEvents();
 
         // THEN
@@ -104,20 +104,20 @@ private Q_SLOTS:
         Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "buffers");
         QCOMPARE(change->subjectId(), clearBuffer->id());
-        QCOMPARE(change->value().value<Qt3DRender::QClearBuffer::BufferType>(), Qt3DRender::QClearBuffer::AllBuffers);
+        QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::AllBuffers);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
         // WHEN
-        clearBuffer->setBuffers(Qt3DRender::QClearBuffer::AllBuffers);
+        clearBuffer->setBuffers(Qt3DRender::QClearBuffers::AllBuffers);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 0);
 
         // WHEN
-        clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
+        clearBuffer->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer);
         QCoreApplication::processEvents();
 
         // THEN
@@ -125,7 +125,7 @@ private Q_SLOTS:
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "buffers");
         QCOMPARE(change->subjectId(), clearBuffer->id());
-        QCOMPARE(change->value().value<Qt3DRender::QClearBuffer::BufferType>(), Qt3DRender::QClearBuffer::ColorDepthBuffer);
+        QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::ColorDepthBuffer);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
@@ -139,6 +139,6 @@ protected:
 
 };
 
-QTEST_MAIN(tst_QClearBuffer)
+QTEST_MAIN(tst_QClearBuffers)
 
-#include "tst_qclearbuffer.moc"
+#include "tst_qclearbuffers.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index e78b98d50..64bc1ddf0 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -23,7 +23,7 @@ contains(QT_CONFIG, private_tests) {
         geometryrenderer \
         raycasting \
         qcameraselector \
-        qclearbuffer \
+        qclearbuffers \
         qframegraphnode \
         qlayerfilter \
         qlight \