summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
diff options
context:
space:
mode:
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.patch32
1 files changed, 17 insertions, 15 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
index 285ae85c..ab08fc08 100644
--- 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
@@ -1,4 +1,4 @@
1From b19c4a2f723525b995ef5b47db0e725a2bb9ab20 Mon Sep 17 00:00:00 2001 1From 5d1c8cdf5d448d5b3f719447dae3a59340348d2e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -12,10 +12,10 @@ Upstream-Status: Pending
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13--- 13---
14 examples/examples.pro | 3 ++- 14 examples/examples.pro | 3 ++-
15 src/designer/src/src.pro | 16 +++++++++------- 15 src/designer/src/src.pro | 18 ++++++++++--------
16 src/linguist/linguist.pro | 2 +- 16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 14 ++++++++------ 17 src/src.pro | 14 ++++++++------
18 tests/auto/auto.pro | 24 +++++++++++++----------- 18 tests/auto/auto.pro | 22 ++++++++++++----------
19 5 files changed, 33 insertions(+), 26 deletions(-) 19 5 files changed, 33 insertions(+), 26 deletions(-)
20 20
21diff --git a/examples/examples.pro b/examples/examples.pro 21diff --git a/examples/examples.pro b/examples/examples.pro
@@ -30,19 +30,21 @@ index 69365d1..da7b38b 100644
30 30
31 winrt: SUBDIRS -= assistant designer 31 winrt: SUBDIRS -= assistant designer
32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro 32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
33index e02ca8e..49527c5 100644 33index 6915e34..3ff2eca 100644
34--- a/src/designer/src/src.pro 34--- a/src/designer/src/src.pro
35+++ b/src/designer/src/src.pro 35+++ b/src/designer/src/src.pro
36@@ -1,18 +1,20 @@ 36@@ -1,13 +1,15 @@
37 TEMPLATE = subdirs 37 TEMPLATE = subdirs
38 38
39-SUBDIRS = \ 39-SUBDIRS = \
40- uiplugin \
40- uitools \ 41- uitools \
41- lib \ 42- lib \
42- components \ 43- components \
43- designer 44- designer
44+!linguistonly { 45+!linguistonly {
45+ SUBDIRS = \ 46+ SUBDIRS = \
47+ uiplugin \
46+ lib \ 48+ lib \
47+ components \ 49+ components \
48+ designer 50+ designer
@@ -52,7 +54,9 @@ index e02ca8e..49527c5 100644
52-contains(QT_CONFIG, shared): SUBDIRS += plugins 54-contains(QT_CONFIG, shared): SUBDIRS += plugins
53+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins 55+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
54 56
55 components.depends = lib 57 uitools.depends = uiplugin
58 lib.depends = uiplugin
59@@ -15,7 +17,7 @@ components.depends = lib
56 designer.depends = components 60 designer.depends = components
57 plugins.depends = lib 61 plugins.depends = lib
58 62
@@ -75,7 +79,7 @@ index 3a70580..a977878 100644
75 qtNomakeTools( \ 79 qtNomakeTools( \
76 linguist \ 80 linguist \
77diff --git a/src/src.pro b/src/src.pro 81diff --git a/src/src.pro b/src/src.pro
78index 722b32e..9453152 100644 82index 494898f..c02848d 100644
79--- a/src/src.pro 83--- a/src/src.pro
80+++ b/src/src.pro 84+++ b/src/src.pro
81@@ -4,10 +4,12 @@ qtHaveModule(widgets) { 85@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -91,15 +95,15 @@ index 722b32e..9453152 100644
91+ qtestlib 95+ qtestlib
92+ } 96+ }
93+ SUBDIRS += designer 97+ SUBDIRS += designer
94 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
95 98
96 linguist.depends = designer 99 linguist.depends = designer
100 }
97@@ -15,7 +17,7 @@ qtHaveModule(widgets) { 101@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
98 }
99 102
100 SUBDIRS += linguist 103 SUBDIRS += linguist \
104 qtplugininfo
101-if(!android|android_app):!ios: SUBDIRS += qtpaths 105-if(!android|android_app):!ios: SUBDIRS += qtpaths
102+if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths 106+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths
103 107
104 mac { 108 mac {
105 SUBDIRS += macdeployqt 109 SUBDIRS += macdeployqt
@@ -118,14 +122,13 @@ index 722b32e..9453152 100644
118 qtNomakeTools( \ 122 qtNomakeTools( \
119 pixeltool \ 123 pixeltool \
120diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro 124diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
121index df240e3..27ee687 100644 125index a703a06..44bae18 100644
122--- a/tests/auto/auto.pro 126--- a/tests/auto/auto.pro
123+++ b/tests/auto/auto.pro 127+++ b/tests/auto/auto.pro
124@@ -1,15 +1,17 @@ 128@@ -1,14 +1,16 @@
125 TEMPLATE=subdirs 129 TEMPLATE=subdirs
126-SUBDIRS=\ 130-SUBDIRS=\
127- linguist \ 131- linguist \
128- host.pro \
129- qhelpcontentmodel \ 132- qhelpcontentmodel \
130- qhelpenginecore \ 133- qhelpenginecore \
131- qhelpgenerator \ 134- qhelpgenerator \
@@ -137,7 +140,6 @@ index df240e3..27ee687 100644
137+!linguistonly { 140+!linguistonly {
138+ SUBDIRS=\ 141+ SUBDIRS=\
139+ linguist \ 142+ linguist \
140+ host.pro \
141+ qhelpcontentmodel \ 143+ qhelpcontentmodel \
142+ qhelpenginecore \ 144+ qhelpenginecore \
143+ qhelpgenerator \ 145+ qhelpgenerator \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-30 00:12:14 +0000