git.libre-soc.org Git - buildroot.git/blob

   1 From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
   2 From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
   3 Date: Mon, 17 Jun 2019 15:20:22 +0200
   4 Subject: Fix compile issue when no opengl in QVideoSurfacePainter
   5
   6 error: invalid use of incomplete type 'class QGLContext'
   7
   8 Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
   9 Fixes: QTBUG-76405
  10 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
  11
  12 [Retrieved from:
  13 https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e]
  14 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  15 ---
  16  src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++----
  17  1 file changed, 4 insertions(+), 4 deletions(-)
  18
  19 diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
  20 index 440d5c858..6af0c7588 100644
  21 --- a/src/multimediawidgets/qpaintervideosurface.cpp
  22 +++ b/src/multimediawidgets/qpaintervideosurface.cpp
  23 @@ -57,10 +57,6 @@
  24  #ifndef GL_RGB8
  25  #define GL_RGB8 0x8051
  26  #endif
  27 -#endif
  28 -
  29 -#include <QtDebug>
  30 -QT_BEGIN_NAMESPACE
  31
  32  static void makeCurrent(QGLContext *context)
  33  {
  34 @@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
  35      if (handle && QOpenGLContext::currentContext() != handle)
  36          handle->makeCurrent(handle->surface());
  37  }
  38 +#endif
  39 +
  40 +#include <QtDebug>
  41 +QT_BEGIN_NAMESPACE
  42
  43  QVideoSurfacePainter::~QVideoSurfacePainter()
  44  {
  45 --
  46 cgit v1.2.1
  47