0002-examples-fix-compile-without-opengl-support.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From adacb2d6701b12511c5a0e58072236da91ebf810 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Mon, 7 Aug 2017 22:54:11 +0200
  4. Subject: [PATCH] examples: fix compile without opengl support
  5. Compile examples/opengl only in case opengl support is available.
  6. Task-number: QTBUG-62372
  7. Change-Id: I742a1eb7b7639a5a722c4d5e9b4ee070b629b02e
  8. Upstream: https://codereview.qt-project.org/201947
  9. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  10. ---
  11. examples/examples.pro | 3 ++-
  12. 1 file changed, 2 insertions(+), 1 deletion(-)
  13. diff --git a/examples/examples.pro b/examples/examples.pro
  14. index a3851c6d81..d87fa2da88 100644
  15. --- a/examples/examples.pro
  16. +++ b/examples/examples.pro
  17. @@ -14,7 +14,8 @@ qtHaveModule(concurrent): SUBDIRS += qtconcurrent
  18. qtHaveModule(sql): SUBDIRS += sql
  19. qtHaveModule(widgets): SUBDIRS += widgets
  20. qtHaveModule(xml): SUBDIRS += xml
  21. -qtHaveModule(gui): SUBDIRS += gui opengl
  22. +qtHaveModule(gui): SUBDIRS += gui
  23. +qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl
  24. aggregate.files = aggregate/examples.pro
  25. aggregate.path = $$[QT_INSTALL_EXAMPLES]
  26. --
  27. 2.11.0