| From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 |
| From: Val Doroshchuk <valentyn.doroshchuk@qt.io> |
| Date: Mon, 17 Jun 2019 15:20:22 +0200 |
| Subject: Fix compile issue when no opengl in QVideoSurfacePainter |
| |
| error: invalid use of incomplete type 'class QGLContext' |
| |
| Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9 |
| Fixes: QTBUG-76405 |
| Reviewed-by: Andy Shaw <andy.shaw@qt.io> |
| |
| [Retrieved from: |
| https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e] |
| Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| --- |
| src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp |
| index 440d5c858..6af0c7588 100644 |
| --- a/src/multimediawidgets/qpaintervideosurface.cpp |
| +++ b/src/multimediawidgets/qpaintervideosurface.cpp |
| @@ -57,10 +57,6 @@ |
| #ifndef GL_RGB8 |
| #define GL_RGB8 0x8051 |
| #endif |
| -#endif |
| - |
| -#include <QtDebug> |
| -QT_BEGIN_NAMESPACE |
| |
| static void makeCurrent(QGLContext *context) |
| { |
| @@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context) |
| if (handle && QOpenGLContext::currentContext() != handle) |
| handle->makeCurrent(handle->surface()); |
| } |
| +#endif |
| + |
| +#include <QtDebug> |
| +QT_BEGIN_NAMESPACE |
| |
| QVideoSurfacePainter::~QVideoSurfacePainter() |
| { |
| -- |
| cgit v1.2.1 |
| |
