Class QRendererSettings rename to QRenderSettings

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

13 files changed, 89 insertions, 89 deletions

diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index ce7889f15..99635c68a 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -115,7 +115,7 @@
 #include <Qt3DRender/qcomputejob.h>
 #include <Qt3DRender/qcameralens.h>
 #include <Qt3DRender/qcamera.h>
-#include <Qt3DRender/qrenderersettings.h>
+#include <Qt3DRender/qrendersettings.h>
 #include <Qt3DQuickRender/private/quick3dtechnique_p.h>
 #include <Qt3DQuickRender/private/quick3dmaterial_p.h>
 #include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h>
@@ -181,7 +181,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     QMetaType::registerConverter<Qt3DRender::Render::Quick::Quick3DShaderDataArray*, QVariantList>(Quick3DShaderDataArrayToVariantListConverter);
 
     // Renderer setttings
-    qmlRegisterType<Qt3DRender::QRendererSettings>(uri, 2, 0, "RendererSettings");
+    qmlRegisterType<Qt3DRender::QRenderSettings>(uri, 2, 0, "RenderSettings");
 
     // @uri Qt3D.Render
     qmlRegisterUncreatableType<Qt3DRender::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract");
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h
index 13eceb3c5..92ff9e456 100644
--- a/src/render/backend/abstractrenderer_p.h
+++ b/src/render/backend/abstractrenderer_p.h
@@ -77,7 +77,7 @@ namespace Render {
 class NodeManagers;
 class Entity;
 class FrameGraphNode;
-class RendererSettings;
+class RenderSettings;
 class BackendNode;
 
 
@@ -142,8 +142,8 @@ public:
     virtual Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const = 0;
     virtual void registerEventFilter(Qt3DCore::QEventFilterService *service) = 0;
 
-    virtual void setSettings(RendererSettings *settings) = 0;
-    virtual RendererSettings *settings() const = 0;
+    virtual void setSettings(RenderSettings *settings) = 0;
+    virtual RenderSettings *settings() const = 0;
 
 };
 
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index c8e8784ea..1ec388bab 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -31,7 +31,7 @@ HEADERS += \
     $$PWD/trianglesvisitor_p.h \
     $$PWD/abstractrenderer_p.h \
     $$PWD/computejob_p.h \
-    $$PWD/renderersettings_p.h \
+    $$PWD/rendersettings_p.h \
     $$PWD/stringtoint_p.h \
     $$PWD/backendnode_p.h \
     $$PWD/rendertargetoutput_p.h
@@ -59,7 +59,7 @@ SOURCES += \
     $$PWD/trianglesextractor.cpp \
     $$PWD/trianglesvisitor.cpp \
     $$PWD/computejob.cpp \
-    $$PWD/renderersettings.cpp \
+    $$PWD/rendersettings.cpp \
     $$PWD/stringtoint.cpp \
     $$PWD/backendnode.cpp \
     $$PWD/rendertargetoutput.cpp
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 570560feb..727768a5c 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -107,7 +107,7 @@ namespace Render {
 
 const QString SCENE_PARSERS_PATH = QStringLiteral("/sceneparsers");
 
-const RendererSettings Renderer::ms_defaultSettings;
+const RenderSettings Renderer::ms_defaultSettings;
 
 /*!
     \internal
@@ -144,7 +144,7 @@ Renderer::Renderer(QRenderAspect::RenderType type)
     , m_glContext(Q_NULLPTR)
     , m_pickBoundingVolumeJob(Q_NULLPTR)
     , m_time(0)
-    , m_settings(const_cast<RendererSettings *>(&ms_defaultSettings))
+    , m_settings(const_cast<RenderSettings *>(&ms_defaultSettings))
 {
     // Set renderer as running - it will wait in the context of the
     // RenderThread for RenderViews to be submitted
@@ -439,17 +439,17 @@ void Renderer::registerEventFilter(QEventFilterService *service)
     service->registerEventFilter(m_pickEventFilter.data(), 1024);
 }
 
-void Renderer::setSettings(RendererSettings *settings)
+void Renderer::setSettings(RenderSettings *settings)
 {
     // If default settings not in use, clean up
     if (m_settings != &ms_defaultSettings)
         delete m_settings;
 
     // If removing settings, restore to default
-    m_settings = (settings != Q_NULLPTR) ? settings : const_cast<RendererSettings *>(&ms_defaultSettings);
+    m_settings = (settings != Q_NULLPTR) ? settings : const_cast<RenderSettings *>(&ms_defaultSettings);
 }
 
-RendererSettings *Renderer::settings() const
+RenderSettings *Renderer::settings() const
 {
     return m_settings;
 }
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 6933c4ead..617cd773f 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -60,7 +60,7 @@
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
 #include <Qt3DRender/private/pickboundingvolumejob_p.h>
-#include <Qt3DRender/private/renderersettings_p.h>
+#include <Qt3DRender/private/rendersettings_p.h>
 
 #include <QHash>
 #include <QMatrix4x4>
@@ -169,8 +169,8 @@ public:
 
     void registerEventFilter(Qt3DCore::QEventFilterService *service) Q_DECL_OVERRIDE;
 
-    virtual void setSettings(RendererSettings *settings) Q_DECL_OVERRIDE;
-    virtual RendererSettings *settings() const Q_DECL_OVERRIDE;
+    virtual void setSettings(RenderSettings *settings) Q_DECL_OVERRIDE;
+    virtual RenderSettings *settings() const Q_DECL_OVERRIDE;
 
     bool executeCommands(const RenderView *rv);
     Attribute *updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
@@ -264,8 +264,8 @@ private:
 
     qint64 m_time;
 
-    RendererSettings *m_settings;
-    static const RendererSettings ms_defaultSettings;
+    RenderSettings *m_settings;
+    static const RenderSettings ms_defaultSettings;
 
     void performDraw(Geometry *rGeometry, GeometryRenderer *rGeometryRenderer,
                      GLsizei primitiveCount, Attribute *indexAttribute);
diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/rendersettings.cpp
index db6bfc55a..e51379e5a 100644
--- a/src/render/backend/renderersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "renderersettings_p.h"
+#include "rendersettings_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/private/abstractrenderer_p.h>
@@ -49,64 +49,64 @@ using namespace Qt3DCore;
 namespace Qt3DRender {
 namespace Render {
 
-RendererSettings::RendererSettings()
+RenderSettings::RenderSettings()
     : BackendNode()
 {
 }
 
-void RendererSettings::updateFromPeer(Qt3DCore::QNode *peer)
+void RenderSettings::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    QRendererSettings *settings = static_cast<QRendererSettings *>(peer);
+    QRenderSettings *settings = static_cast<QRenderSettings *>(peer);
     m_pickMethod = settings->pickMethod();
     m_pickResultMode = settings->pickResultMode();
 }
 
-void RendererSettings::cleanup()
+void RenderSettings::cleanup()
 {
-    m_pickMethod = QRendererSettings::BoundingVolumePicking;
-    m_pickResultMode = QRendererSettings::NearestPick;
+    m_pickMethod = QRenderSettings::BoundingVolumePicking;
+    m_pickResultMode = QRenderSettings::NearestPick;
 }
 
-void RendererSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void RenderSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("pickMethod"))
-            m_pickMethod = propertyChange->value().value<QRendererSettings::PickMethod>();
+            m_pickMethod = propertyChange->value().value<QRenderSettings::PickMethod>();
         else if (propertyChange->propertyName() == QByteArrayLiteral("pickResult"))
-            m_pickResultMode = propertyChange->value().value<QRendererSettings::PickResultMode>();
+            m_pickResultMode = propertyChange->value().value<QRenderSettings::PickResultMode>();
         markDirty(AbstractRenderer::AllDirty);
     }
 }
 
 
-RendererSettingsFunctor::RendererSettingsFunctor(AbstractRenderer *renderer)
+RenderSettingsFunctor::RenderSettingsFunctor(AbstractRenderer *renderer)
     : m_renderer(renderer)
 {
 }
 
-Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *frontend) const
+Qt3DCore::QBackendNode *RenderSettingsFunctor::create(Qt3DCore::QNode *frontend) const
 {
-    QRendererSettings *settingsFrontend = static_cast<QRendererSettings *>(frontend);
+    QRenderSettings *settingsFrontend = static_cast<QRenderSettings *>(frontend);
     if (m_renderer->settings() != Q_NULLPTR) {
         qWarning() << "Renderer settings already exists";
         return Q_NULLPTR;
     }
 
-    RendererSettings *settings = new RendererSettings;
+    RenderSettings *settings = new RenderSettings;
     settings->setPeer(settingsFrontend);
     settings->setRenderer(m_renderer);
     m_renderer->setSettings(settings);
     return settings;
 }
 
-Qt3DCore::QBackendNode *RendererSettingsFunctor::get(Qt3DCore::QNodeId id) const
+Qt3DCore::QBackendNode *RenderSettingsFunctor::get(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
     return Q_NULLPTR;
 }
 
-void RendererSettingsFunctor::destroy(Qt3DCore::QNodeId id) const
+void RenderSettingsFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
     // Deletes the old settings object
diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/rendersettings_p.h
index 802519cca..fdca3e0bc 100644
--- a/src/render/backend/renderersettings_p.h
+++ b/src/render/backend/rendersettings_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERERSETTINGS_H
-#define QT3DRENDER_RENDER_RENDERERSETTINGS_H
+#ifndef QT3DRENDER_RENDER_RENDERSETTINGS_H
+#define QT3DRENDER_RENDER_RENDERSETTINGS_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DRender/private/backendnode_p.h>
-#include <Qt3DRender/qrenderersettings.h>
+#include <Qt3DRender/qrendersettings.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,24 +61,24 @@ namespace Render {
 
 class AbstractRenderer;
 
-class RendererSettings : public BackendNode
+class RenderSettings : public BackendNode
 {
 public:
-    RendererSettings();
+    RenderSettings();
 
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void cleanup();
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QRendererSettings::PickMethod m_pickMethod;
-    QRendererSettings::PickResultMode m_pickResultMode;
+    QRenderSettings::PickMethod m_pickMethod;
+    QRenderSettings::PickResultMode m_pickResultMode;
 };
 
-class RendererSettingsFunctor : public Qt3DCore::QBackendNodeMapper
+class RenderSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
-    explicit RendererSettingsFunctor(AbstractRenderer *renderer);
+    explicit RenderSettingsFunctor(AbstractRenderer *renderer);
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
     void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
@@ -92,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERERSETTINGS_H
+#endif // QT3DRENDER_RENDER_RENDERSETTINGS_H
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index edf829fb6..7603ed7ee 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -78,7 +78,7 @@
 #include <Qt3DRender/qdispatchcompute.h>
 #include <Qt3DRender/qcomputejob.h>
 #include <Qt3DRender/qrendersurfaceselector.h>
-#include <Qt3DRender/qrenderersettings.h>
+#include <Qt3DRender/qrendersettings.h>
 
 #include <Qt3DRender/private/cameraselectornode_p.h>
 #include <Qt3DRender/private/layerfilternode_p.h>
@@ -124,7 +124,7 @@
 #include <Qt3DRender/private/dispatchcompute_p.h>
 #include <Qt3DRender/private/computejob_p.h>
 #include <Qt3DRender/private/rendersurfaceselector_p.h>
-#include <Qt3DRender/private/renderersettings_p.h>
+#include <Qt3DRender/private/rendersettings_p.h>
 #include <Qt3DRender/private/backendnode_p.h>
 
 #include <Qt3DCore/qentity.h>
@@ -289,7 +289,7 @@ void QRenderAspect::registerBackendTypes()
     registerBackendType<QLighting>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::Lighting, QLighting>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
     registerBackendType<QDispatchCompute>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::DispatchCompute, QDispatchCompute>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
     registerBackendType<QComputeJob>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::ComputeJob, Render::ComputeJobManager>(d->m_renderer, d->m_nodeManagers->computeJobManager())));
-    registerBackendType<QRendererSettings>(QBackendNodeMapperPtr(new Render::RendererSettingsFunctor(d->m_renderer)));
+    registerBackendType<QRenderSettings>(QBackendNodeMapperPtr(new Render::RenderSettingsFunctor(d->m_renderer)));
     registerBackendType<QRenderState>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderStateNode, Render::RenderStateManager>(d->m_renderer, d->m_nodeManagers->renderStateManager())));
 }
 
diff --git a/src/render/frontend/qrenderersettings.cpp b/src/render/frontend/qrendersettings.cpp
index 50e13ea39..06dfa238d 100644
--- a/src/render/frontend/qrenderersettings.cpp
+++ b/src/render/frontend/qrendersettings.cpp
@@ -37,50 +37,50 @@
 **
 ****************************************************************************/
 
-#include "qrenderersettings.h"
-#include "qrenderersettings_p.h"
+#include "qrendersettings.h"
+#include "qrendersettings_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-QRendererSettingsPrivate::QRendererSettingsPrivate()
+QRenderSettingsPrivate::QRenderSettingsPrivate()
     : Qt3DCore::QComponentPrivate()
-    , m_pickMethod(QRendererSettings::BoundingVolumePicking)
-    , m_pickResultMode(QRendererSettings::NearestPick)
+    , m_pickMethod(QRenderSettings::BoundingVolumePicking)
+    , m_pickResultMode(QRenderSettings::NearestPick)
 {
 }
 
-QRendererSettings::QRendererSettings(Qt3DCore::QNode *parent)
-    : Qt3DCore::QComponent(*new QRendererSettingsPrivate, parent)
+QRenderSettings::QRenderSettings(Qt3DCore::QNode *parent)
+    : Qt3DCore::QComponent(*new QRenderSettingsPrivate, parent)
 {
 }
 
-QRendererSettings::QRendererSettings(QRendererSettingsPrivate &dd, Qt3DCore::QNode *parent)
+QRenderSettings::QRenderSettings(QRenderSettingsPrivate &dd, Qt3DCore::QNode *parent)
     : Qt3DCore::QComponent(dd, parent)
 {
 }
 
-QRendererSettings::~QRendererSettings()
+QRenderSettings::~QRenderSettings()
 {
     QNode::cleanup();
 }
 
-QRendererSettings::PickMethod QRendererSettings::pickMethod() const
+QRenderSettings::PickMethod QRenderSettings::pickMethod() const
 {
-    Q_D(const QRendererSettings);
+    Q_D(const QRenderSettings);
     return d->m_pickMethod;
 }
 
-QRendererSettings::PickResultMode QRendererSettings::pickResultMode() const
+QRenderSettings::PickResultMode QRenderSettings::pickResultMode() const
 {
-    Q_D(const QRendererSettings);
+    Q_D(const QRenderSettings);
     return d->m_pickResultMode;
 }
 
-void QRendererSettings::setPickMethod(QRendererSettings::PickMethod pickMethod)
+void QRenderSettings::setPickMethod(QRenderSettings::PickMethod pickMethod)
 {
-    Q_D(QRendererSettings);
+    Q_D(QRenderSettings);
     if (d->m_pickMethod == pickMethod)
         return;
 
@@ -88,9 +88,9 @@ void QRendererSettings::setPickMethod(QRendererSettings::PickMethod pickMethod)
     emit pickMethodChanged(pickMethod);
 }
 
-void QRendererSettings::setPickResultMode(QRendererSettings::PickResultMode pickResultMode)
+void QRenderSettings::setPickResultMode(QRenderSettings::PickResultMode pickResultMode)
 {
-    Q_D(QRendererSettings);
+    Q_D(QRenderSettings);
     if (d->m_pickResultMode == pickResultMode)
         return;
 
@@ -98,10 +98,10 @@ void QRendererSettings::setPickResultMode(QRendererSettings::PickResultMode pick
     emit pickResultModeChanged(pickResultMode);
 }
 
-void QRendererSettings::copy(const QNode *ref)
+void QRenderSettings::copy(const QNode *ref)
 {
     QComponent::copy(ref);
-    const QRendererSettings *object = static_cast<const QRendererSettings *>(ref);
+    const QRenderSettings *object = static_cast<const QRenderSettings *>(ref);
     d_func()->m_pickMethod = object->d_func()->m_pickMethod;
     d_func()->m_pickResultMode = object->d_func()->m_pickResultMode;
 }
diff --git a/src/render/frontend/qrenderersettings.h b/src/render/frontend/qrendersettings.h
index a68193836..5d31189b6 100644
--- a/src/render/frontend/qrenderersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QRENDERERSETTINGS_H
-#define QT3DRENDER_QRENDERERSETTINGS_H
+#ifndef QT3DRENDER_QRENDERSETTINGS_H
+#define QT3DRENDER_QRENDERSETTINGS_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRender/qt3drender_global.h>
@@ -47,17 +47,17 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QRendererSettingsPrivate;
+class QRenderSettingsPrivate;
 
-class QT3DRENDERSHARED_EXPORT QRendererSettings : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(PickMethod pickMethod READ pickMethod WRITE setPickMethod NOTIFY pickMethodChanged)
     Q_PROPERTY(PickResultMode pickResultMode READ pickResultMode WRITE setPickResultMode NOTIFY pickResultModeChanged)
 
 public:
-    explicit QRendererSettings(Qt3DCore::QNode *parent = nullptr);
-    ~QRendererSettings();
+    explicit QRenderSettings(Qt3DCore::QNode *parent = nullptr);
+    ~QRenderSettings();
 
     enum PickMethod {
         BoundingVolumePicking,
@@ -83,16 +83,16 @@ Q_SIGNALS:
     void pickResultModeChanged(PickResultMode pickResult);
 
 protected:
-    Q_DECLARE_PRIVATE(QRendererSettings)
-    QRendererSettings(QRendererSettingsPrivate &dd, Qt3DCore::QNode *parent = nullptr);
+    Q_DECLARE_PRIVATE(QRenderSettings)
+    QRenderSettings(QRenderSettingsPrivate &dd, Qt3DCore::QNode *parent = nullptr);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    QT3D_CLONEABLE(QRendererSettings)
+    QT3D_CLONEABLE(QRenderSettings)
 };
 
 } // namespace Qt3Drender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QRENDERERSETTINGS_H
+#endif // QT3DRENDER_QRENDERSETTINGS_H
diff --git a/src/render/frontend/qrenderersettings_p.h b/src/render/frontend/qrendersettings_p.h
index a80f8f854..a3d98555d 100644
--- a/src/render/frontend/qrenderersettings_p.h
+++ b/src/render/frontend/qrendersettings_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QRENDERERSETTINGS_P_H
-#define QT3DRENDER_QRENDERERSETTINGS_P_H
+#ifndef QT3DRENDER_QRENDERSETTINGS_P_H
+#define QT3DRENDER_QRENDERSETTINGS_P_H
 
 //
 //  W A R N I N G
@@ -52,23 +52,23 @@
 //
 
 #include <Qt3DCore/private/qcomponent_p.h>
-#include <Qt3DRender/qrenderersettings.h>
+#include <Qt3DRender/qrendersettings.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QRendererSettingsPrivate : public Qt3DCore::QComponentPrivate
+class QRenderSettingsPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
-    QRendererSettingsPrivate();
+    QRenderSettingsPrivate();
 
-    QRendererSettings::PickMethod m_pickMethod;
-    QRendererSettings::PickResultMode m_pickResultMode;
+    QRenderSettings::PickMethod m_pickMethod;
+    QRenderSettings::PickResultMode m_pickResultMode;
 };
 
 } // namespace Qt3Drender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QRENDERERSETTINGS_P_H
+#endif // QT3DRENDER_QRENDERSETTINGS_P_H
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 1f67475ea..0c6823dc3 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -17,10 +17,10 @@ HEADERS += \
     $$PWD/qcamera.h \
     $$PWD/qcameralens.h \
     $$PWD/qcameralens_p.h \
-    $$PWD/qrenderersettings.h \
-    $$PWD/qrenderersettings_p.h \
     $$PWD/qrendertargetoutput.h \
-    $$PWD/qrendertargetoutput_p.h
+    $$PWD/qrendertargetoutput_p.h \
+    $$PWD/qrendersettings.h \
+    $$PWD/qrendersettings_p.h
 
 SOURCES += \
     $$PWD/qabstractfunctor.cpp \
@@ -33,5 +33,5 @@ SOURCES += \
     $$PWD/qcomputejob.cpp \
     $$PWD/qcamera.cpp \
     $$PWD/qcameralens.cpp \
-    $$PWD/qrenderersettings.cpp \
+    $$PWD/qrendersettings.cpp \
     $$PWD/qrendertargetoutput.cpp
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 1194e6c38..977b915e1 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -64,8 +64,8 @@ public:
     Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
     Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
     void registerEventFilter(Qt3DCore::QEventFilterService *service) Q_DECL_OVERRIDE { Q_UNUSED(service); }
-    void setSettings(Qt3DRender::Render::RendererSettings *settings) Q_DECL_OVERRIDE { Q_UNUSED(settings); }
-    Qt3DRender::Render::RendererSettings *settings() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    void setSettings(Qt3DRender::Render::RenderSettings *settings) Q_DECL_OVERRIDE { Q_UNUSED(settings); }
+    Qt3DRender::Render::RenderSettings *settings() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
 
     void markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node) Q_DECL_OVERRIDE;
     Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet dirtyBits() Q_DECL_OVERRIDE;