summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:50:37 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:50:37 +0200
commit3fa7bb148ed40bd018ce51b5f20c0c8792638568 (patch)
treedc7b2847822189d5c0cbc7195fbca3556d6aa6a2 /recipes-qt/qt5/qttools
parent17eb158c6d2cd290b054b5bd54311aa44a02d04d (diff)
downloadmeta-qt5-3fa7bb148ed40bd018ce51b5f20c0c8792638568.tar.gz
qt5: drop recipes for 5.4.1 version
* we don't plan to keep 2 versions, one from tarballs and one from git now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful anymore Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools')
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch155
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch32
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch51
3 files changed, 0 insertions, 238 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 @@
1From 80d7d1844e6e088bde4c83881ea38a52a7e608c2 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 1/3] 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 | 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
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 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
32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
33index 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 \
64diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
65index 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 \
77diff --git a/src/src.pro b/src/src.pro
78index 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 \
120diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
121index 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--
1542.3.1
155
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
deleted file mode 100644
index c6cf4a6d..00000000
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 21163294f5f1ae633db63c5d27b458ba189dcc16 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get:
10| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
11| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
12
13Upstream-Status: Inappropriate [configuration]
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 src/assistant/help/help.pro | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 168d23d..a9c3b59 100644
22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro
24@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \
25 # access to clucene
26 HEADERS += qhelpsearchindexwriter_clucene_p.h \
27 qhelpsearchindexreader_clucene_p.h
28+
29+LIBS += -lQt5CLucene
30--
312.3.1
32
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
deleted file mode 100644
index 2e3349ba..00000000
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From e3aba30a9cece54dd6a7edfcb39cbb1805b3dcac Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/3] add noqtwebkit configuration
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropiate [configuration]
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 src/assistant/assistant/assistant.pro | 4 ++--
15 src/designer/src/plugins/plugins.pro | 2 +-
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index 6e82b07..56df78c 100644
20--- a/src/assistant/assistant/assistant.pro
21+++ b/src/assistant/assistant/assistant.pro
22@@ -1,4 +1,4 @@
23-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
24+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
25 QT += webkitwidgets
26 } else {
27 DEFINES += QT_NO_WEBKIT
28@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \
29 openpageswidget.cpp \
30 openpagesmanager.cpp \
31 openpagesswitcher.cpp
32-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
33+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
34 SOURCES += helpviewer_qwv.cpp
35 } else {
36 SOURCES += helpviewer_qtb.cpp
37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
38index 500a153..b60fa2d 100644
39--- a/src/designer/src/plugins/plugins.pro
40+++ b/src/designer/src/plugins/plugins.pro
41@@ -1,6 +1,6 @@
42 TEMPLATE = subdirs
43
44 # qtHaveModule(opengl): SUBDIRS += tools/view3d
45-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
46+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49--
502.3.1
51