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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
From f5d7b5cd073eb6b5a60658b9622c59a682fd828d Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
is built without GUI support (no-png is set) and we still want to build
native lrelease + lupdate + lconvert tools.
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
---
examples/examples.pro | 4 ++--
src/designer/src/src.pro | 14 ++++++++------
src/linguist/linguist.pro | 2 +-
src/src.pro | 10 ++++++----
tests/auto/auto.pro | 20 +++++++++++---------
5 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/examples/examples.pro b/examples/examples.pro
index 4955969..8e86419 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
-
+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
+qtHaveModule(widgets): SUBDIRS += linguist uitools
diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 64d1c37..6e6912d 100644
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -1,10 +1,12 @@
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS = \
- uitools \
- lib \
- components \
- designer
+!linguistonly {
+ SUBDIRS = \
+ lib \
+ components \
+ designer
+}
+SUBDIRS += uitools
-contains(QT_CONFIG, shared): SUBDIRS += plugins
+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 04b0ab6..8c63bb4 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
lrelease \
lupdate \
lconvert
-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
win32:CMAKE_BIN_SUFFIX = ".exe"
diff --git a/src/src.pro b/src/src.pro
index 3799567..7deb785 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,10 +5,12 @@ qtHaveModule(widgets) {
no-png {
message("Some graphics-related tools are unavailable without PNG support")
} else {
- SUBDIRS = assistant \
+ !linguistonly {
+ SUBDIRS = assistant \
pixeltool \
- qtestlib \
- designer
+ qtestlib
+ }
+ SUBDIRS += designer
# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
}
}
@@ -21,7 +23,7 @@ mac {
embedded:SUBDIRS += kmap2qmap
-qtHaveModule(dbus): SUBDIRS += qdbus
+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
# We don't need these command line utilities on embedded platforms.
embedded: SUBDIRS += makeqpf
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 074aa34..d38e05d 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,13 +1,15 @@
TEMPLATE=subdirs
-SUBDIRS=\
- linguist \
- host.pro \
- qhelpcontentmodel \
- qhelpenginecore \
- qhelpgenerator \
- qhelpindexmodel \
- qhelpprojectdata \
- cmake
+!linguistonly {
+ SUBDIRS=\
+ linguist \
+ host.pro \
+ qhelpcontentmodel \
+ qhelpenginecore \
+ qhelpgenerator \
+ qhelpindexmodel \
+ qhelpprojectdata \
+ cmake
+}
# These tests don't make sense for cross-compiled builds
cross_compile:SUBDIRS -= host.pro
--
1.7.10.4
|
