qt5script-0001-Check-for-QtGui-before-building-the-examples.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. qt5script: Check for QtGui before building the examples
  2. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  3. From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001
  4. From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  5. Date: Wed, 16 Apr 2014 12:19:17 +0100
  6. Subject: [PATCH] qtscript: Check for QtGui before building the examples
  7. qsdbg and marshal examples need QtGui module. If QtGui is not installed
  8. they fail to compile.
  9. Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41
  10. Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  11. Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
  12. ---
  13. examples/script/script.pro | 9 ++++-----
  14. 1 file changed, 4 insertions(+), 5 deletions(-)
  15. diff --git a/examples/script/script.pro b/examples/script/script.pro
  16. index 3e1eae6..cc97233 100644
  17. --- a/examples/script/script.pro
  18. +++ b/examples/script/script.pro
  19. @@ -1,7 +1,7 @@
  20. TEMPLATE = subdirs
  21. -SUBDIRS = \
  22. - customclass \
  23. - qsdbg
  24. +SUBDIRS = customclass
  25. +
  26. +qtHaveModule(gui): SUBDIRS += qsdbg
  27. qtHaveModule(widgets) {
  28. SUBDIRS += \
  29. @@ -22,8 +22,7 @@ qtHaveModule(widgets) {
  30. }
  31. !wince {
  32. - SUBDIRS += \
  33. - marshal
  34. + qtHaveModule(gui): SUBDIRS += marshal
  35. }
  36. maemo5: CONFIG += qt_example
  37. --
  38. 1.9.1