0003-eglfs-fix-x11-header-related-compile-failure.patch 1.0 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 8902f4d7b7c532592d1a34ad117698d3e380e9e1 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Fri, 10 Mar 2017 22:23:06 +0100
  4. Subject: [PATCH] eglfs: fix x11 header related compile failure
  5. Add egl config and QT_EGL_NO_X11 define (as all other eglfs project
  6. files do).
  7. Task-number: QTBUG-59427
  8. Change-Id: Ifbb11eae0fdf0e58c0b7feecb9a7914a889c8f77
  9. Upstream: https://codereview.qt-project.org/188158
  10. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  11. ---
  12. src/plugins/platforms/eglfs/eglfs-plugin.pro | 5 +++++
  13. 1 file changed, 5 insertions(+)
  14. diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
  15. index cf4863975a..ec229796e5 100644
  16. --- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
  17. +++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
  18. @@ -2,6 +2,11 @@ TARGET = qeglfs
  19. QT += eglfsdeviceintegration-private
  20. +CONFIG += egl
  21. +
  22. +# Avoid X11 header collision, use generic EGL native types
  23. +DEFINES += QT_EGL_NO_X11
  24. +
  25. SOURCES += $$PWD/qeglfsmain.cpp
  26. OTHER_FILES += $$PWD/eglfs.json
  27. --
  28. 2.11.0