Remove QSGEngine

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

4 files changed, 1 insertions, 219 deletions

diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index 7cbff40a9b..35b97c3d15 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -68,7 +68,6 @@ class QQuickCanvas;
 class QSGTexture;
 class QSGMaterial;
 class QSGMaterialShader;
-class QSGEngine;
 class QQuickWindowManager;
 
 class QOpenGLContext;
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index b6f7a228d2..fea921163a 100644
--- a/src/quick/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
@@ -1,4 +1,4 @@
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
+qsg!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
 # Core API
 HEADERS += \
@@ -24,7 +24,6 @@ SOURCES += \
 HEADERS += \
     $$PWD/util/qsgareaallocator_p.h \
     $$PWD/util/qsgdepthstencilbuffer_p.h \
-    $$PWD/util/qsgengine.h \
     $$PWD/util/qsgflatcolormaterial.h \
     $$PWD/util/qsgsimplematerial.h \
     $$PWD/util/qsgsimplerectnode.h \
@@ -41,7 +40,6 @@ HEADERS += \
 SOURCES += \
     $$PWD/util/qsgareaallocator.cpp \
     $$PWD/util/qsgdepthstencilbuffer.cpp \
-    $$PWD/util/qsgengine.cpp \
     $$PWD/util/qsgflatcolormaterial.cpp \
     $$PWD/util/qsgsimplerectnode.cpp \
     $$PWD/util/qsgsimpletexturenode.cpp \
diff --git a/src/quick/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp
deleted file mode 100644
index 5d50002870..0000000000
--- a/src/quick/scenegraph/util/qsgengine.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qsgengine.h"
-
-#include <QtQuick/qquickcanvas.h>
-
-#include <private/qobject_p.h>
-#include <QtGui/QColor>
-
-QT_BEGIN_NAMESPACE
-
-class QSGEnginePrivate : public QObjectPrivate
-{
-public:
-    QSGEnginePrivate()
-        : canvas(0)
-    {
-    }
-
-    QQuickCanvas *canvas;
-};
-
-/*!
-    \class QSGEngine
-    \deprecated
- */
-
-QSGEngine::QSGEngine(QObject *parent) :
-    QObject(*(new QSGEnginePrivate), parent)
-{
-}
-
-
-QSGEngine::~QSGEngine()
-{
-}
-
-
-void QSGEngine::setCanvas(QQuickCanvas *canvas)
-{
-    d_func()->canvas = canvas;
-    connect(canvas, SIGNAL(afterRendering()), this, SIGNAL(afterRendering()), Qt::DirectConnection);
-    connect(canvas, SIGNAL(beforeRendering()), this, SIGNAL(beforeRendering()), Qt::DirectConnection);
-}
-
-void QSGEngine::setClearBeforeRendering(bool enabled)
-{
-    d_func()->canvas->setClearBeforeRendering(enabled);
-}
-
-bool QSGEngine::clearBeforeRendering() const
-{
-    return d_func()->canvas->clearBeforeRendering();
-}
-
-QSGTexture *QSGEngine::createTextureFromImage(const QImage &image) const
-{
-    return d_func()->canvas->createTextureFromImage(image);
-}
-
-QSGTexture *QSGEngine::createTextureFromId(uint id, const QSize &size, TextureOptions options) const
-{
-    return d_func()->canvas->createTextureFromId(id, size, QQuickCanvas::CreateTextureOptions((int) options));
-}
-
-void QSGEngine::setClearColor(const QColor &color)
-{
-    d_func()->canvas->setClearColor(color);
-}
-
-QColor QSGEngine::clearColor() const
-{
-    return d_func()->canvas->clearColor();
-}
-
-QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h
deleted file mode 100644
index f62bdb2ab3..0000000000
--- a/src/quick/scenegraph/util/qsgengine.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSGENGINE_H
-#define QSGENGINE_H
-
-#include <QObject>
-
-#include <QtQuick/qsgtexture.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QSGEnginePrivate;
-
-class QQuickCanvas;
-
-class Q_QUICK_EXPORT QSGEngine : public QObject
-{
-    Q_OBJECT
-
-    Q_DECLARE_PRIVATE(QSGEngine)
-
-public:
-
-    enum TextureOption {
-        TextureHasAlphaChannel  = 0x0001,
-        TextureHasMipmaps       = 0x0002,
-        TextureOwnsGLTexture    = 0x0004
-    };
-    Q_DECLARE_FLAGS(TextureOptions, TextureOption)
-
-    QSGTexture *createTextureFromImage(const QImage &image) const;
-    QSGTexture *createTextureFromId(uint id, const QSize &size, TextureOptions options = TextureOption(0)) const;
-
-    void setClearBeforeRendering(bool enabled);
-    bool clearBeforeRendering() const;
-
-    void setClearColor(const QColor &color);
-    QColor clearColor() const;
-
-Q_SIGNALS:
-    void beforeRendering();
-    void afterRendering();
-
-private:
-    QSGEngine(QObject *parent = 0);
-    ~QSGEngine();
-
-    friend class QSGContext;
-    friend class QSGContextPrivate;
-    friend class QQuickCanvasPrivate;
-    void setCanvas(QQuickCanvas *canvas);
-
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QSGENGINE_H