2
1

0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch 1.4 KB

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