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 12:07:09 +0200 |
| commit | 76a5e8903e56de6746bdd3c6d5627817b114ea09 (patch) | |
| tree | c84ab19e53ac3853372c4e8106b4e6c5651a7ddb /src/multimediawidgets | |
| parent | 962371cbe3f01f3c30991522de1d03c8dfd77164 (diff) | |
| parent | be84c8103b830c4c4bbda7ccfc72aea5b10e779b (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I2f2a9371dd1085c10450f23e56c9f18078cc8698
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() { |