Revert post FF changes

Change-Id: Idf5f80bcfa0427e6545feca33312f08c1172dfb2
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 9 insertions, 15 deletions

diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp
index 487f6e11a..8638352c4 100644
--- a/src/render/backend/rendersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -79,20 +79,21 @@ void RenderSettings::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firs
         m_renderPolicy = node->renderPolicy();
     }
 
-    if (node->pickingSettings()->pickMethod() != m_pickMethod) {
-        m_pickMethod = node->pickingSettings()->pickMethod();
+    auto ncnode = const_cast<QRenderSettings *>(node);
+    if (ncnode->pickingSettings()->pickMethod() != m_pickMethod) {
+        m_pickMethod = ncnode->pickingSettings()->pickMethod();
     }
 
-    if (node->pickingSettings()->pickResultMode() != m_pickResultMode) {
-        m_pickResultMode = node->pickingSettings()->pickResultMode();
+    if (ncnode->pickingSettings()->pickResultMode() != m_pickResultMode) {
+        m_pickResultMode = ncnode->pickingSettings()->pickResultMode();
     }
 
-    if (node->pickingSettings()->worldSpaceTolerance() != m_pickWorldSpaceTolerance) {
-        m_pickWorldSpaceTolerance = node->pickingSettings()->worldSpaceTolerance();
+    if (ncnode->pickingSettings()->worldSpaceTolerance() != m_pickWorldSpaceTolerance) {
+        m_pickWorldSpaceTolerance = ncnode->pickingSettings()->worldSpaceTolerance();
     }
 
-    if (node->pickingSettings()->faceOrientationPickingMode() != m_faceOrientationPickingMode) {
-        m_faceOrientationPickingMode = node->pickingSettings()->faceOrientationPickingMode();
+    if (ncnode->pickingSettings()->faceOrientationPickingMode() != m_faceOrientationPickingMode) {
+        m_faceOrientationPickingMode = ncnode->pickingSettings()->faceOrientationPickingMode();
     }
 
     // Either because something above as changed or if QRenderSettingsPrivate::invalidFrame()
diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp
index d106e4205..5916c4b73 100644
--- a/src/render/frontend/qrendersettings.cpp
+++ b/src/render/frontend/qrendersettings.cpp
@@ -161,12 +161,6 @@ QPickingSettings *QRenderSettings::pickingSettings()
     return &(d->m_pickingSettings);
 }
 
-const QPickingSettings *QRenderSettings::pickingSettings() const
-{
-    Q_D(const QRenderSettings);
-    return &(d->m_pickingSettings);
-}
-
 /*!
     \qmlproperty FrameGraphNode RenderSettings::activeFrameGraph
 
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h
index c8771a8fa..9d2baa58b 100644
--- a/src/render/frontend/qrendersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -71,7 +71,6 @@ public:
     Q_ENUM(RenderPolicy) // LCOV_EXCL_LINE
 
     QPickingSettings* pickingSettings();
-    const QPickingSettings* pickingSettings() const;
     QFrameGraphNode *activeFrameGraph() const;
     RenderPolicy renderPolicy() const;