diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-17 15:51:29 +0100 |
---|---|---|
committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-17 08:01:27 +0100 |
commit | f2bbc9c69f5265986dd5574a790e189a7a126c61 (patch) | |
tree | 77affb6415c6b276bcc3e7f17a2e663c189ef82d /src/opengl/qopenglwidget.cpp | |
parent | bd4635009d3ba6ea560bc5f70811fa0afee518fc (diff) |
Move QOpenGLFrameBufferObject from QtGui to QtOpenGL
Task-number: QTBUG-74409
Change-Id: I817ea6f052fc61a6465d443450c8017ac5d0c0e9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/opengl/qopenglwidget.cpp')
-rw-r--r-- | src/opengl/qopenglwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/opengl/qopenglwidget.cpp b/src/opengl/qopenglwidget.cpp index b334ba867b..cf22a5e2df 100644 --- a/src/opengl/qopenglwidget.cpp +++ b/src/opengl/qopenglwidget.cpp @@ -39,7 +39,6 @@ #include "qopenglwidget.h" #include <QtGui/QOpenGLContext> -#include <QtGui/QOpenGLFramebufferObject> #include <QtGui/QOffscreenSurface> #include <QtGui/QOpenGLFunctions> #include <QtGui/QWindow> @@ -47,12 +46,14 @@ #include <QtGui/QScreen> #include <QtGui/qpa/qplatformwindow.h> #include <QtGui/qpa/qplatformintegration.h> +#include <QtOpenGL/QOpenGLFramebufferObject> #include <QtOpenGL/QOpenGLPaintDevice> #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qopenglextensions_p.h> #include <QtGui/private/qfont_p.h> #include <QtGui/private/qopenglcontext_p.h> +#include <QtOpenGL/private/qopenglframebufferobject_p.h> #include <QtOpenGL/private/qopenglpaintdevice_p.h> #include <QtWidgets/private/qwidget_p.h> @@ -930,8 +931,6 @@ void QOpenGLWidgetPrivate::invalidateFbo() } } -extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha); - QImage QOpenGLWidgetPrivate::grabFramebuffer() { Q_Q(QOpenGLWidget); |