diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-05-02 17:29:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 13:03:43 +0200 |
| commit | 8867be2d1d92e981ed736330f036a681ce4b520b (patch) | |
| tree | e747a789684c2f5fa4392ba7faf2d84568a1b065 /src/quick/items/qquickcanvas.cpp | |
| parent | b9ccb579c4c93f23e6ceeea26b07d418ad4e5562 (diff) | |
Remove QSGEngine
Change-Id: Iaab0d9f607b1f4ca6dfb13495a456d1b31bb980a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas.cpp')
| -rw-r--r-- | src/quick/items/qquickcanvas.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
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. |