qt5base-0007-Fix-no-opengl-build-with-egl.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. From cd14b80dd87ff9ae632bf0479a1d824c72316362 Mon Sep 17 00:00:00 2001
  2. From: Laszlo Agocs <laszlo.agocs@digia.com>
  3. Date: Wed, 12 Mar 2014 16:56:19 +0100
  4. Subject: [PATCH] Fix no-opengl build with egl
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Disable eglfs and similar plugins when opengl is not enabled.
  9. (but egl is present)
  10. GL-dependent parts of eglconvenience need to be skipped too.
  11. Task-number: QTBUG-37457
  12. Change-Id: I44d49495241551bc7b1f565aa0b5ace9f310628e
  13. Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  14. Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
  15. Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
  16. Conflicts:
  17. src/platformsupport/eglconvenience/eglconvenience.pri
  18. ---
  19. configure | 2 +-
  20. src/platformsupport/eglconvenience/eglconvenience.pri | 7 +++++--
  21. 2 files changed, 6 insertions(+), 3 deletions(-)
  22. diff --git a/configure b/configure
  23. index aaa59bd..0c310ff 100755
  24. --- a/configure
  25. +++ b/configure
  26. @@ -5337,7 +5337,7 @@ if [ "$CFG_EGL" != "no" ]; then
  27. fi
  28. if [ "$CFG_EGLFS" != "no" ]; then
  29. - if [ "$XPLATFORM_QNX" = "no" ]; then
  30. + if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then
  31. CFG_EGLFS="$CFG_EGL"
  32. else
  33. CFG_EGLFS="no"
  34. diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
  35. index 506f4ab..462c60c 100644
  36. --- a/src/platformsupport/eglconvenience/eglconvenience.pri
  37. +++ b/src/platformsupport/eglconvenience/eglconvenience.pri
  38. @@ -1,13 +1,16 @@
  39. contains(QT_CONFIG,egl) {
  40. HEADERS += \
  41. $$PWD/qeglconvenience_p.h \
  42. - $$PWD/qeglplatformcontext_p.h \
  43. $$PWD/qeglpbuffer_p.h
  44. SOURCES += \
  45. $$PWD/qeglconvenience.cpp \
  46. - $$PWD/qeglplatformcontext.cpp \
  47. $$PWD/qeglpbuffer.cpp
  48. + contains(QT_CONFIG,opengl) {
  49. + HEADERS += $$PWD/qeglplatformcontext_p.h
  50. + SOURCES += $$PWD/qeglplatformcontext.cpp
  51. + }
  52. +
  53. contains(QT_CONFIG,xlib) {
  54. HEADERS += \
  55. $$PWD/qxlibeglintegration_p.h
  56. --
  57. 1.9.1