diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 13:55:40 +0200 |
| commit | 6dc5f327adfa987d2c03db3506c761d77a62e013 (patch) | |
| tree | 81be0bffcdcc560aa0bbb8b7df0601aa0627f2a3 /src | |
| parent | 940306f134ded0a323821526d09f12670495b29c (diff) | |
| parent | 76a5e8903e56de6746bdd3c6d5627817b114ea09 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src')
| -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() { |