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