Remove QSGEngine

Change-Id: Iaab0d9f607b1f4ca6dfb13495a456d1b31bb980a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

8 files changed, 0 insertions, 40 deletions

diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 618178fd1c..7110351cc7 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -45,7 +45,6 @@
 #include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgnode.h>
-#include <QtQuick/qsgengine.h>
 #include <QtQuick/qsgtexturematerial.h>
 #include <QtQuick/qsgtexture.h>
 #include <QtQuick/qquickcanvas.h>
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 17f9947b66..a6905b55aa 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -49,7 +49,6 @@
 #include <QtQuick/private/qsgrenderer_p.h>
 #include <QtQuick/private/qsgtexture_p.h>
 #include <QtQuick/private/qsgflashnode_p.h>
-#include <QtQuick/qsgengine.h>
 
 #include <private/qquickwindowmanager_p.h>
 
@@ -350,10 +349,6 @@ void QQuickCanvasPrivate::init(QQuickCanvas *c)
     QObject::connect(context, SIGNAL(initialized()), q, SIGNAL(sceneGraphInitialized()), Qt::DirectConnection);
     QObject::connect(context, SIGNAL(invalidated()), q, SIGNAL(sceneGraphInvalidated()), Qt::DirectConnection);
     QObject::connect(context, SIGNAL(invalidated()), q, SLOT(cleanupSceneGraph()), Qt::DirectConnection);
-
-    // ### TODO: remove QSGEngine
-    engine = new QSGEngine();
-    engine->setCanvas(q);
 }
 
 QQmlListProperty<QObject> QQuickCanvasPrivate::data()
@@ -2126,26 +2121,6 @@ QOpenGLContext *QQuickCanvas::openglContext() const
     This signal will be emitted from the scene graph rendering thread.
  */
 
-/*!
-    Returns the QSGEngine used for this scene.
-
-    The engine will only be available once the scene graph has been
-    initialized. Register for the sceneGraphEngine() signal to get
-    notification about this.
-
-    \deprecated
- */
-
-QSGEngine *QQuickCanvas::sceneGraphEngine() const
-{
-    Q_D(const QQuickCanvas);
-    qWarning("QQuickCanvas::sceneGraphEngine() is deprecated, use members of QQuickCanvas instead");
-    if (d->context && d->context->isReady())
-        return d->engine;
-    return 0;
-}
-
-
 
 /*!
     Sets the render target for this canvas to be \a fbo.
diff --git a/src/quick/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h
index 396bc2b8ff..0e06202849 100644
--- a/src/quick/items/qquickcanvas.h
+++ b/src/quick/items/qquickcanvas.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QSGEngine;
 class QQuickItem;
 class QSGTexture;
 class QInputMethodEvent;
@@ -89,8 +88,6 @@ public:
 
     bool sendEvent(QQuickItem *, QEvent *);
 
-    QSGEngine *sceneGraphEngine() const;
-
     QImage grabFrameBuffer();
 
     void setRenderTarget(QOpenGLFramebufferObject *fbo);
diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h
index 643d694400..d592121938 100644
--- a/src/quick/items/qquickcanvas_p.h
+++ b/src/quick/items/qquickcanvas_p.h
@@ -174,7 +174,6 @@ public:
 
     void fireFrameSwapped() { emit q_func()->frameSwapped(); }
 
-    QSGEngine *engine;
     QSGContext *context;
     QSGRenderer *renderer;
 
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index a0e1c2a650..88663411a9 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2144,11 +2144,6 @@ QQuickItem *QQuickItem::parentItem() const
     return d->parentItem;
 }
 
-QSGEngine *QQuickItem::sceneGraphEngine() const
-{
-    return canvas()->sceneGraphEngine();
-}
-
 QQuickCanvas *QQuickItem::canvas() const
 {
     Q_D(const QQuickItem);
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 0d74cc0c4d..69122bdbcd 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -89,7 +89,6 @@ class QQuickKeyEvent;
 class QQuickAnchors;
 class QQuickItemPrivate;
 class QQuickCanvas;
-class QSGEngine;
 class QTouchEvent;
 class QSGNode;
 class QSGTransformNode;
@@ -195,8 +194,6 @@ public:
     QQuickItem(QQuickItem *parent = 0);
     virtual ~QQuickItem();
 
-    QSGEngine *sceneGraphEngine() const;
-
     QQuickCanvas *canvas() const;
     QQuickItem *parentItem() const;
     void setParentItem(QQuickItem *parent);
diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp
index 2a151d02a8..fca6fbc19e 100644
--- a/src/quick/items/qquickspriteimage.cpp
+++ b/src/quick/items/qquickspriteimage.cpp
@@ -45,7 +45,6 @@
 #include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgnode.h>
-#include <QtQuick/qsgengine.h>
 #include <QtQuick/qsgtexturematerial.h>
 #include <QtQuick/qsgtexture.h>
 #include <QtQuick/qquickcanvas.h>
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index ce0a246748..80dad16fe3 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -45,7 +45,6 @@
 #include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgnode.h>
-#include <QtQuick/qsgengine.h>
 #include <QtQuick/qsgtexturematerial.h>
 #include <QtQuick/qsgtexture.h>
 #include <QtQuick/qquickcanvas.h>