diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:36:38 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:36:38 +0200 |
| commit | ca240ae578900d3d12cd9344e9c3ee58cd484d06 (patch) | |
| tree | 4461f598854acce404f612633ca0557445100f41 /src/multimediawidgets | |
| parent | e988f423991084eb7187c420676e875ffb355188 (diff) | |
| parent | 9bbf9f0d862b8d458e59690d36641618fb101b4e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ieed5727ca602712ac008a876333e36ebb3dcba30
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 8 |
1 files 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() { |