Removed factory member variable

The variable was removed from QBackendNode and subsequently
all areas it appeared.

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

44 files changed, 45 insertions, 88 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 06e241f65..05bcbf41a 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -145,7 +145,7 @@ QBackendNode *QAbstractAspectPrivate::createBackendNode(QNode *frontend) const
         QBackendNode *backend = functor->get(frontend->id());
         if (backend != Q_NULLPTR)
             return backend;
-        backend = functor->create(frontend, this);
+        backend = functor->create(frontend);
         // backend could be null if the user decides that his functor should only
         // perform some action when encountering a given type of item but doesn't need to
         // return a QBackendNode pointer.
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index d864288cb..b7529f42b 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -39,7 +39,6 @@
 
 #include "qbackendnode.h"
 #include "qbackendnode_p.h"
-#include "qbackendnodefactory_p.h"
 #include "qaspectengine.h"
 #include "qnode.h"
 
@@ -50,7 +49,6 @@ namespace Qt3DCore {
 QBackendNodePrivate::QBackendNodePrivate(QBackendNode::Mode mode)
     : q_ptr(Q_NULLPTR)
     , m_mode(mode)
-    , m_factory(Q_NULLPTR)
     , m_arbiter(Q_NULLPTR)
 {
 }
@@ -92,12 +90,6 @@ QBackendNode::~QBackendNode()
     delete d_ptr;
 }
 
-void QBackendNode::setFactory(const QBackendNodeFactory *factory)
-{
-    Q_D(QBackendNode);
-    d->m_factory = factory;
-}
-
 void QBackendNode::setPeer(QNode *peer)
 {
     Q_D(QBackendNode);
@@ -120,13 +112,6 @@ QBackendNode::Mode QBackendNode::mode() const Q_DECL_NOEXCEPT
     return d->m_mode;
 }
 
-QBackendNode *QBackendNode::createBackendNode(QNode *frontend) const
-{
-    Q_D(const QBackendNode);
-    Q_ASSERT(d->m_factory);
-    return d->m_factory->createBackendNode(frontend);
-}
-
 /*! \internal */
 QBackendNode::QBackendNode(QBackendNodePrivate &dd)
     : d_ptr(&dd)
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h
index 5b3dab1d3..d8e3dbbda 100644
--- a/src/core/nodes/qbackendnode.h
+++ b/src/core/nodes/qbackendnode.h
@@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QBackendNodeFactory;
 class QBackendNodePrivate;
 class QBackendNode;
 class QAspectEngine;
@@ -57,7 +56,7 @@ class QT3DCORESHARED_EXPORT QBackendNodeFunctor
 {
 public:
     virtual ~QBackendNodeFunctor() {}
-    virtual QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const = 0;
+    virtual QBackendNode *create(QNode *frontend) const = 0;
     virtual QBackendNode *get(const QNodeId &id) const = 0;
     virtual void destroy(const QNodeId &id) const = 0;
 };
@@ -75,8 +74,6 @@ public:
     explicit QBackendNode(Mode mode = ReadOnly);
     virtual ~QBackendNode();
 
-    void setFactory(const QBackendNodeFactory *factory);
-
     void setPeer(QNode *peer);
     QNodeId peerUuid() const Q_DECL_NOEXCEPT;
 
diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h
index fc2e410d1..4b42f2720 100644
--- a/src/core/nodes/qbackendnode_p.h
+++ b/src/core/nodes/qbackendnode_p.h
@@ -63,8 +63,6 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QBackendNodeFactory;
-
 class QT3DCORE_PRIVATE_EXPORT QBackendNodePrivate
         : public QObserverInterface
         , public QObservableInterface
@@ -72,7 +70,6 @@ class QT3DCORE_PRIVATE_EXPORT QBackendNodePrivate
 public:
     QBackendNodePrivate(QBackendNode::Mode mode);
 
-    void setFactory(const QBackendNodeFactory *factory);
     void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE;
     void notifyObservers(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
@@ -83,7 +80,6 @@ public:
     QBackendNode *q_ptr;
     QBackendNode::Mode m_mode;
 
-    const QBackendNodeFactory *m_factory;
     QLockableObserverInterface *m_arbiter;
     QNodeId m_peerUuid;
 };
diff --git a/src/input/backend/axisactionhandler.cpp b/src/input/backend/axisactionhandler.cpp
index 2142975b9..9e78a3a9c 100644
--- a/src/input/backend/axisactionhandler.cpp
+++ b/src/input/backend/axisactionhandler.cpp
@@ -111,12 +111,11 @@ AxisActionHandlerNodeFunctor::AxisActionHandlerNodeFunctor(AxisActionHandlerMana
 {
 }
 
-Qt3DCore::QBackendNode *AxisActionHandlerNodeFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *AxisActionHandlerNodeFunctor::create(Qt3DCore::QNode *frontend) const
 {
     HAxisActionHandler handle = m_manager->getOrAcquireHandle(frontend->id());
     AxisActionHandler *backend = m_manager->data(handle);
     m_manager->addActiveAxisActionHandler(handle);
-    backend->setFactory(factory);
     backend->setPeer(frontend);
     return backend;
 }
diff --git a/src/input/backend/axisactionhandler_p.h b/src/input/backend/axisactionhandler_p.h
index b1f516cd6..56cec078a 100644
--- a/src/input/backend/axisactionhandler_p.h
+++ b/src/input/backend/axisactionhandler_p.h
@@ -88,7 +88,7 @@ class AxisActionHandlerNodeFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit AxisActionHandlerNodeFunctor(AxisActionHandlerManager *manager);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp
index fab7484de..ad15dedc5 100644
--- a/src/input/backend/genericdevicebackendnode.cpp
+++ b/src/input/backend/genericdevicebackendnode.cpp
@@ -101,10 +101,9 @@ GenericDeviceBackendFunctor::GenericDeviceBackendFunctor(QInputAspect *inputaspe
 {
 }
 
-Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNode *frontend) const
 {
     GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(frontend->id());
-    backendNode->setFactory(factory);
     backendNode->setInputAspect(m_inputAspect);
     backendNode->setPeer(frontend);
     m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(frontend->id()));
diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h
index b9bbf6a09..a29927f42 100644
--- a/src/input/backend/genericdevicebackendnode_p.h
+++ b/src/input/backend/genericdevicebackendnode_p.h
@@ -88,7 +88,7 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h
index c70c7d2df..5dd93c01f 100644
--- a/src/input/backend/inputbackendnodefunctor_p.h
+++ b/src/input/backend/inputbackendnodefunctor_p.h
@@ -69,10 +69,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL
     {
         Backend *backend = m_manager->getOrCreateResource(frontend->id());
-        backend->setFactory(factory);
         backend->setPeer(frontend);
         return backend;
     }
diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp
index a3dc532a8..6fac4e1a9 100644
--- a/src/input/backend/inputsettings.cpp
+++ b/src/input/backend/inputsettings.cpp
@@ -75,7 +75,7 @@ InputSettingsFunctor::InputSettingsFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNode *frontend) const
 {
     if (m_handler->inputSettings() != Q_NULLPTR) {
         qWarning() << "Input settings already specified";
@@ -83,7 +83,6 @@ Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNode *frontend,
     }
 
     InputSettings *settings = new InputSettings();
-    settings->setFactory(factory);
     settings->setPeer(frontend);
     m_handler->setInputSettings(settings);
     return settings;
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index a4750d846..5ed021562 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -81,7 +81,7 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit InputSettingsFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/input/backend/keyboardcontroller.cpp b/src/input/backend/keyboardcontroller.cpp
index 0153cef1e..6d878edae 100644
--- a/src/input/backend/keyboardcontroller.cpp
+++ b/src/input/backend/keyboardcontroller.cpp
@@ -455,10 +455,9 @@ KeyboardControllerFunctor::KeyboardControllerFunctor(QInputAspect *inputaspect,
 {
 }
 
-Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *frontend) const
 {
     KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id());
-    controller->setFactory(factory);
     controller->setInputAspect(m_inputAspect);
     controller->setInputHandler(m_handler);
     controller->setPeer(frontend);
diff --git a/src/input/backend/keyboardcontroller_p.h b/src/input/backend/keyboardcontroller_p.h
index 7803a6099..859f4c8aa 100644
--- a/src/input/backend/keyboardcontroller_p.h
+++ b/src/input/backend/keyboardcontroller_p.h
@@ -275,7 +275,7 @@ class KeyboardControllerFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit KeyboardControllerFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/input/backend/keyboardinput.cpp b/src/input/backend/keyboardinput.cpp
index d52bf89e9..cc8d957c9 100644
--- a/src/input/backend/keyboardinput.cpp
+++ b/src/input/backend/keyboardinput.cpp
@@ -152,10 +152,9 @@ KeyboardInputFunctor::KeyboardInputFunctor(InputHandler *handler)
 {
 }
 
-QBackendNode *KeyboardInputFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+QBackendNode *KeyboardInputFunctor::create(QNode *frontend) const
 {
     KeyboardInput *input = m_handler->keyboardInputManager()->getOrCreateResource(frontend->id());
-    input->setFactory(factory);
     input->setInputHandler(m_handler);
     input->setPeer(frontend);
     return input;
diff --git a/src/input/backend/keyboardinput_p.h b/src/input/backend/keyboardinput_p.h
index 87490cef3..b6aaa4cd7 100644
--- a/src/input/backend/keyboardinput_p.h
+++ b/src/input/backend/keyboardinput_p.h
@@ -92,7 +92,7 @@ class KeyboardInputFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit KeyboardInputFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index a4be30ee7..f8469fb68 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -98,12 +98,11 @@ LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager
 {
 }
 
-Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNode *frontend) const
 {
     HLogicalDevice handle = m_manager->getOrAcquireHandle(frontend->id());
     LogicalDevice *backend = m_manager->data(handle);
     m_manager->addActiveDevice(handle);
-    backend->setFactory(factory);
     backend->setPeer(frontend);
     return backend;
 }
diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h
index 4c28c06a5..5e56793c6 100644
--- a/src/input/backend/logicaldevice_p.h
+++ b/src/input/backend/logicaldevice_p.h
@@ -87,7 +87,7 @@ class LogicalDeviceNodeFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
diff --git a/src/input/backend/mousecontroller.cpp b/src/input/backend/mousecontroller.cpp
index c038e8bcd..d35dd0480 100644
--- a/src/input/backend/mousecontroller.cpp
+++ b/src/input/backend/mousecontroller.cpp
@@ -149,10 +149,9 @@ MouseControllerFunctor::MouseControllerFunctor(QInputAspect *inputAspect, InputH
 {
 }
 
-Qt3DCore::QBackendNode *MouseControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *MouseControllerFunctor::create(Qt3DCore::QNode *frontend) const
 {
     MouseController *controller = m_handler->mouseControllerManager()->getOrCreateResource(frontend->id());
-    controller->setFactory(factory);
     controller->setInputAspect(m_inputAspect);
     controller->setInputHandler(m_handler);
     controller->setPeer(frontend);
diff --git a/src/input/backend/mousecontroller_p.h b/src/input/backend/mousecontroller_p.h
index b6ad774e5..720a57628 100644
--- a/src/input/backend/mousecontroller_p.h
+++ b/src/input/backend/mousecontroller_p.h
@@ -117,7 +117,7 @@ class MouseControllerFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit MouseControllerFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/input/backend/mouseinput.cpp b/src/input/backend/mouseinput.cpp
index d2a765630..0ffbb9f07 100644
--- a/src/input/backend/mouseinput.cpp
+++ b/src/input/backend/mouseinput.cpp
@@ -134,10 +134,9 @@ MouseInputFunctor::MouseInputFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *MouseInputFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *MouseInputFunctor::create(Qt3DCore::QNode *frontend) const
 {
     MouseInput *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id());
-    input->setFactory(factory);
     input->setInputHandler(m_handler);
     input->setPeer(frontend);
     return input;
diff --git a/src/input/backend/mouseinput_p.h b/src/input/backend/mouseinput_p.h
index 738e0424b..7f47d4560 100644
--- a/src/input/backend/mouseinput_p.h
+++ b/src/input/backend/mouseinput_p.h
@@ -90,7 +90,7 @@ class MouseInputFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit MouseInputFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp
index 0c902671f..bdd0ca612 100644
--- a/src/logic/handler.cpp
+++ b/src/logic/handler.cpp
@@ -67,10 +67,9 @@ HandlerFunctor::HandlerFunctor(Manager *manager)
 {
 }
 
-Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend) const
 {
     Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id());
-    handler->setFactory(factory);
     handler->setManager(m_manager);
     handler->setPeer(frontend);
     m_manager->appendHandler(handler);
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index ea819bb55..c94d588e8 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -85,7 +85,7 @@ class HandlerFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit HandlerFunctor(Manager *handler);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 7cc4eaa95..4af409771 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -522,11 +522,10 @@ RenderEntityFunctor::RenderEntityFunctor(NodeManagers *manager)
 {
 }
 
-Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend) const
 {
     HEntity renderNodeHandle = m_nodeManagers->renderNodesManager()->getOrAcquireHandle(frontend->id());
     Entity *entity = m_nodeManagers->renderNodesManager()->data(renderNodeHandle);
-    entity->setFactory(factory);
     entity->setNodeManagers(m_nodeManagers);
     entity->setHandle(renderNodeHandle);
     entity->setPeer(frontend);
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index 0ec8506c9..ae88e3320 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -280,7 +280,7 @@ class RenderEntityFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RenderEntityFunctor(NodeManagers *manager);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h
index c7cb6884e..2456a68e1 100644
--- a/src/render/backend/nodefunctor_p.h
+++ b/src/render/backend/nodefunctor_p.h
@@ -69,10 +69,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL
     {
         Backend *backend = m_manager->getOrCreateResource(frontend->id());
-        backend->setFactory(factory);
         backend->setPeer(frontend);
         return backend;
     }
diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/renderersettings.cpp
index 0098de93e..75d0181bd 100644
--- a/src/render/backend/renderersettings.cpp
+++ b/src/render/backend/renderersettings.cpp
@@ -84,7 +84,7 @@ RendererSettingsFunctor::RendererSettingsFunctor(AbstractRenderer *renderer)
 {
 }
 
-Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *frontend) const
 {
     QRendererSettings *settingsFrontend = static_cast<QRendererSettings *>(frontend);
     if (m_renderer->settings() != Q_NULLPTR) {
@@ -93,7 +93,6 @@ Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *fronten
     }
 
     RendererSettings *settings = new RendererSettings;
-    settings->setFactory(factory);
     settings->setPeer(settingsFrontend);
     m_renderer->setSettings(settings);
     return settings;
diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/renderersettings_p.h
index 2321f74d6..10707000b 100644
--- a/src/render/backend/renderersettings_p.h
+++ b/src/render/backend/renderersettings_p.h
@@ -79,7 +79,7 @@ class RendererSettingsFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RendererSettingsFunctor(AbstractRenderer *renderer);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index f5e99d830..7b76f29ce 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -143,7 +143,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(AbstractRenderer *rendere
 {
 }
 
-Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *) const
+Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *frontend) const
 {
     // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method
     // to do that
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index a0a45f37c..e6d35849a 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -131,9 +131,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE
     {
-        return createBackendFrameGraphNode(frontend, factory);
+        return createBackendFrameGraphNode(frontend);
     }
 
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE
@@ -147,13 +147,12 @@ public:
     }
 
 protected:
-    Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const
+    Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n) const
     {
         Frontend *f = qobject_cast<Frontend *>(n);
         if (f != Q_NULLPTR) {
             if (!m_manager->containsNode(n->id())) {
                 Backend *backend = new Backend();
-                backend->setFactory(factory);
                 backend->setFrameGraphManager(m_manager);
                 backend->setPeer(f);
                 QFrameGraphNode *parentFGNode = static_cast<QFrameGraphNode *>(n)->parentFrameGraphNode();
@@ -175,7 +174,7 @@ class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit FrameGraphComponentFunctor(AbstractRenderer *renderer);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index dd43a7fe3..16772515e 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -149,10 +149,9 @@ BufferFunctor::BufferFunctor(BufferManager *manager)
 {
 }
 
-Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend) const
 {
     Buffer *buffer = m_manager->getOrCreateResource(frontend->id());
-    buffer->setFactory(factory);
     buffer->setManager(m_manager);
     buffer->setPeer(frontend);
     return buffer;
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index dd0c8d623..d760afd63 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -98,7 +98,7 @@ class BufferFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit BufferFunctor(BufferManager *manager);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 5440dc5f1..5f9a486e5 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -214,10 +214,9 @@ GeometryRendererFunctor::GeometryRendererFunctor(GeometryRendererManager *manage
 {
 }
 
-Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend) const
 {
     GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id());
-    geometryRenderer->setFactory(factory);
     geometryRenderer->setManager(m_manager);
     geometryRenderer->setPeer(frontend);
     return geometryRenderer;
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 6cb277980..d560ecefa 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -115,7 +115,7 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit GeometryRendererFunctor(GeometryRendererManager *manager);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp
index d22c9f92f..19a196fbe 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -108,10 +108,9 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager)
 {
 }
 
-Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend) const
 {
     Scene *scene = m_sceneManager->getOrCreateResource(frontend->id());
-    scene->setFactory(factory);
     scene->setSceneManager(m_sceneManager);
     scene->setPeer(frontend);
     return scene;
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index bfcce2c64..98f1013dd 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -88,7 +88,7 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RenderSceneFunctor(SceneManager *sceneManager);
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp
index 0382e1f41..36db98c93 100644
--- a/src/render/lights/light.cpp
+++ b/src/render/lights/light.cpp
@@ -57,10 +57,9 @@ RenderLightFunctor::RenderLightFunctor(NodeManagers *managers)
 {
 }
 
-Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNode *frontend) const
 {
     Light *backend = m_managers->lightManager()->getOrCreateResource(frontend->id());
-    backend->setFactory(factory);
     backend->setManagers(m_managers);
     backend->setPeer(frontend);
     return backend;
diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h
index af9ee536a..4ab89a4a7 100644
--- a/src/render/lights/light_p.h
+++ b/src/render/lights/light_p.h
@@ -72,7 +72,7 @@ class RenderLightFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit RenderLightFunctor(NodeManagers *managers);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 2301e0984..75144bc3a 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -317,10 +317,9 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(NodeManagers *managers)
 {
 }
 
-Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend) const
 {
     ShaderData *backend = m_managers->shaderDataManager()->getOrCreateResource(frontend->id());
-    backend->setFactory(factory);
     backend->setManagers(m_managers);
     backend->setPeer(frontend);
     return backend;
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index a77434ce8..60b082c9f 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -122,7 +122,7 @@ class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit RenderShaderDataFunctor(NodeManagers *managers);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 6c3288720..f77abd28f 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -665,10 +665,9 @@ TextureFunctor::TextureFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend) const
 {
     Texture *backend = m_textureManager->getOrCreateResource(frontend->id());
-    backend->setFactory(factory);
     backend->setTextureManager(m_textureManager);
     backend->setTextureImageManager(m_textureImageManager);
     backend->setTextureDataManager(m_textureDataManager);
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index f2b6fee9a..56900d31c 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -167,7 +167,7 @@ public:
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 90dfb3f0e..d63990d25 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -164,10 +164,9 @@ TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend) const
 {
     TextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id());
-    backend->setFactory(factory);
     backend->setTextureManager(m_textureManager);
     backend->setTextureImageManager(m_textureImageManager);
     backend->setTextureDataManager(m_textureDataManager);
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index cb1f0619e..b4ab2f432 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -121,7 +121,7 @@ public:
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
     Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
     void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;