diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-06 18:25:23 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-02 15:44:33 +0200 |
| commit | bfa9e94600d4decdf0dfe8e522a5bf468a4a512e (patch) | |
| tree | 6c9b925a053f1d4c74034e5078fc4810238ea894 /src/quick/items/qquickwindow.h | |
| parent | 2efc801a13c775cd2377001fe3362e94edc0e97b (diff) | |
Remove OpenGL FBO references in QQuickWindow and the renderer API
setRenderTarget(GLuint), setRenderTarget(QQuickFramebufferObject*),
renderScene(uint fboId), QSGBindable, etc. are now removed.
This leads to a simpler and cleaner interface in QSGAbstractRenderer and
QSGRenderer because the somewhat weird renderScene() overloading (where
one version is virtual, while the other isn't) is now avoided, with just
a single renderScene() virtual now.
Task-number: QTBUG-84040
Change-Id: I0ce5a159a557688bdfcb7cacf8a9d12d6fd970d1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 820b53cce9..e78e56b1de 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -58,7 +58,6 @@ class QInputMethodEvent; class QQuickWindowPrivate; class QQuickWindowAttached; class QOpenGLContext; -class QOpenGLFramebufferObject; class QQmlIncubationController; class QInputMethodEvent; class QQuickCloseEvent; @@ -133,15 +132,6 @@ public: QImage grabWindow(); - // ### Qt 6 remove all these 5 functions. Replaced by setRenderTarget(QQuickRenderTarget*). -#if QT_CONFIG(opengl) - void setRenderTarget(QOpenGLFramebufferObject *fbo); - QOpenGLFramebufferObject *renderTarget() const; -#endif - void setRenderTarget(uint fboId, const QSize &size); - uint renderTargetId() const; - QSize renderTargetSize() const; - void setRenderTarget(const QQuickRenderTarget &target); #if QT_CONFIG(opengl) |