Make QQuickRenderControl public

QQuickRenderControl allows rendering Qt Quick 2 scenes into framebuffer
objects which can then be used in arbitrary ways in Qt-based or 3rd party
OpenGL renderers.

[ChangeLog][QtQuick] Introduced QQuickRenderControl as a public API.

Task-number: QTBUG-37944
Change-Id: I84262243b261b35cefdf67ec6bba8127a0f29275
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

1 files changed, 29 insertions, 39 deletions

diff --git a/src/quick/items/qquickrendercontrol_p.h b/src/quick/items/qquickrendercontrol_p.h
index cc30e37724..18b1b370b3 100644
--- a/src/quick/items/qquickrendercontrol_p.h
+++ b/src/quick/items/qquickrendercontrol_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
@@ -42,55 +42,45 @@
 #ifndef QQUICKRENDERCONTROL_P_H
 #define QQUICKRENDERCONTROL_P_H
 
-#include <QtGui/QImage>
-#include <private/qtquickglobal_p.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-QT_BEGIN_NAMESPACE
+#include "qquickrendercontrol.h"
+#include <QtQuick/private/qsgcontext_p.h>
 
-class QQuickWindow;
-class QSGContext;
-class QSGRenderContext;
-class QAnimationDriver;
-class QOpenGLContext;
-class QQuickRenderControlPrivate;
+QT_BEGIN_NAMESPACE
 
-class Q_QUICK_PRIVATE_EXPORT QQuickRenderControl : public QObject
+class QQuickRenderControlPrivate : public QObjectPrivate
 {
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QQuickRenderControl)
 public:
-    QQuickRenderControl();
-    ~QQuickRenderControl();
+    Q_DECLARE_PUBLIC(QQuickRenderControl)
 
-    QQuickWindow *window() const;
-    QQuickWindow *createOffscreenWindow();
-    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return 0; }
-    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = 0);
+    QQuickRenderControlPrivate();
+    ~QQuickRenderControlPrivate();
 
-    void windowDestroyed();
+    static QQuickRenderControlPrivate *get(QQuickRenderControl *renderControl) {
+        return renderControl->d_func();
+    }
 
-    void initialize(QOpenGLContext *gl);
-    void invalidate();
-    void polishItems();
-    void render();
-    bool sync();
-    void stop();
+    static void cleanup();
 
-    QImage grab();
-
-Q_SIGNALS:
-    void renderRequested();
-    void sceneChanged();
+    void windowDestroyed();
 
-private:
-    friend class QQuickWindowPrivate;
-    friend class QQuickWindow;
-    void setWindow(QQuickWindow *window);
-    inline void update() { /*emit*/ renderRequested(); }
-    inline void maybeUpdate() { /*emit*/ sceneChanged(); }
+    void update();
+    void maybeUpdate();
 
-    QSGContext *sceneGraphContext() const;
-    QSGRenderContext *renderContext(QSGContext *) const;
+    bool initialized;
+    QQuickWindow *window;
+    static QSGContext *sg;
+    QSGRenderContext *rc;
 };
 
 QT_END_NAMESPACE