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