summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch')
-rw-r--r--recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch138
1 files changed, 0 insertions, 138 deletions
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
deleted file mode 100644
index b1145be1..00000000
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ /dev/null
@@ -1,138 +0,0 @@
1From 3a1d11f3391d7745a01a68629d04f8b5b3c40ffb Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
13---
14 examples/examples.pro | 4 ++--
15 src/designer/src/src.pro | 16 +++++++++-------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 10 ++++++----
18 tests/auto/auto.pro | 22 ++++++++++++----------
19 5 files changed, 30 insertions(+), 24 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 4955969..8e86419 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,3 +1,3 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28-
29+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
30+qtHaveModule(widgets): SUBDIRS += linguist uitools
31diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
32index e02ca8e..49527c5 100644
33--- a/src/designer/src/src.pro
34+++ b/src/designer/src/src.pro
35@@ -1,18 +1,20 @@
36 TEMPLATE = subdirs
37
38-SUBDIRS = \
39- uitools \
40- lib \
41- components \
42- designer
43+!linguistonly {
44+ SUBDIRS = \
45+ lib \
46+ components \
47+ designer
48+}
49+SUBDIRS += uitools
50
51-contains(QT_CONFIG, shared): SUBDIRS += plugins
52+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
53
54 components.depends = lib
55 designer.depends = components
56 plugins.depends = lib
57
58-qtNomakeTools( \
59+!linguistonly:qtNomakeTools( \
60 lib \
61 components \
62 designer \
63diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
64index df3c0c7..75bdf26 100644
65--- a/src/linguist/linguist.pro
66+++ b/src/linguist/linguist.pro
67@@ -3,7 +3,7 @@ SUBDIRS = \
68 lrelease \
69 lupdate \
70 lconvert
71-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
72+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
73
74 qtNomakeTools( \
75 linguist \
76diff --git a/src/src.pro b/src/src.pro
77index c8756db..d71c4a0 100644
78--- a/src/src.pro
79+++ b/src/src.pro
80@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
81 no-png {
82 message("Some graphics-related tools are unavailable without PNG support")
83 } else {
84- SUBDIRS = assistant \
85+ !linguistonly {
86+ SUBDIRS = assistant \
87 pixeltool \
88- qtestlib \
89- designer
90+ qtestlib
91+ }
92+ SUBDIRS += designer
93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
94
95 linguist.depends = designer
96@@ -20,7 +22,7 @@ mac {
97 SUBDIRS += macdeployqt
98 }
99
100-qtHaveModule(dbus): SUBDIRS += qdbus
101+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
102
103 qtNomakeTools( \
104 pixeltool \
105diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
106index eaf440b..1778ad1 100644
107--- a/tests/auto/auto.pro
108+++ b/tests/auto/auto.pro
109@@ -1,14 +1,16 @@
110 TEMPLATE=subdirs
111-SUBDIRS=\
112- linguist \
113- host.pro \
114- qhelpcontentmodel \
115- qhelpenginecore \
116- qhelpgenerator \
117- qhelpindexmodel \
118- qhelpprojectdata \
119- cmake \
120- installed_cmake
121+!linguistonly {
122+ SUBDIRS=\
123+ linguist \
124+ host.pro \
125+ qhelpcontentmodel \
126+ qhelpenginecore \
127+ qhelpgenerator \
128+ qhelpindexmodel \
129+ qhelpprojectdata \
130+ cmake \
131+ installed_cmake
132+}
133
134 installed_cmake.depends = cmake
135
136--
1371.8.3.2
138