1 From f4eb217f9b706a13e7f8256b8540970cfc78d805 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
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.
10 Upstream-Status: Pending
12 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 examples/examples.pro | 4 ++--
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(+), 27 deletions(-)
21 diff --git a/examples/examples.pro b/examples/examples.pro
22 index 4955969..8e86419 100644
23 --- a/examples/examples.pro
24 +++ b/examples/examples.pro
27 -qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
29 +!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
30 +qtHaveModule(widgets): SUBDIRS += linguist uitools
31 diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
32 index e02ca8e..49527c5 100644
33 --- a/src/designer/src/src.pro
34 +++ b/src/designer/src/src.pro
51 -contains(QT_CONFIG, shared): SUBDIRS += plugins
52 +!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
54 components.depends = lib
55 designer.depends = components
59 +!linguistonly:qtNomakeTools( \
63 diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
64 index 3a70580..a977878 100644
65 --- a/src/linguist/linguist.pro
66 +++ b/src/linguist/linguist.pro
67 @@ -3,7 +3,7 @@ SUBDIRS = \
71 -!no-png:qtHaveModule(widgets): SUBDIRS += linguist
72 +!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
76 diff --git a/src/src.pro b/src/src.pro
77 index a486d65..3aeac1e 100644
80 @@ -4,10 +4,12 @@ qtHaveModule(widgets) {
82 message("Some graphics-related tools are unavailable without PNG support")
84 - SUBDIRS = assistant \
86 + SUBDIRS = assistant \
93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
95 linguist.depends = designer
96 @@ -15,7 +17,7 @@ qtHaveModule(widgets) {
100 -if(!android|android_app):!ios: SUBDIRS += qtpaths
101 +if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths
104 SUBDIRS += macdeployqt
105 @@ -25,11 +27,11 @@ android {
106 SUBDIRS += androiddeployqt
109 -qtHaveModule(dbus): SUBDIRS += qdbus
110 +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
112 win32|winrt:SUBDIRS += windeployqt
113 winrt:SUBDIRS += winrtrunner qtd3dservice
114 -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
115 +!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
119 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
120 index c3acfe3..f2f88f7 100644
121 --- a/tests/auto/auto.pro
122 +++ b/tests/auto/auto.pro
128 - qhelpcontentmodel \
140 + qhelpcontentmodel \
150 installed_cmake.depends = cmake