summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-09-23 16:56:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-09-25 14:24:08 +0200
commit8f765ed71128ecc50aa7cd464be1332658df6e10 (patch)
tree14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qttools
parent52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff)
downloadmeta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream 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.patch20
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch4
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch4
3 files changed, 15 insertions, 13 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 ab08fc08..7d14014d 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 5d1c8cdf5d448d5b3f719447dae3a59340348d2e Mon Sep 17 00:00:00 2001 1From 922931781bd4fd765de996f1709aff95b6ac3fba 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
@@ -15,8 +15,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15 src/designer/src/src.pro | 18 ++++++++++-------- 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 | 22 ++++++++++++---------- 18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 33 insertions(+), 26 deletions(-) 19 5 files changed, 34 insertions(+), 27 deletions(-)
20 20
21diff --git a/examples/examples.pro b/examples/examples.pro 21diff --git a/examples/examples.pro b/examples/examples.pro
22index 69365d1..da7b38b 100644 22index 69365d1..da7b38b 100644
@@ -122,10 +122,10 @@ index 494898f..c02848d 100644
122 qtNomakeTools( \ 122 qtNomakeTools( \
123 pixeltool \ 123 pixeltool \
124diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro 124diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
125index a703a06..44bae18 100644 125index 20b5fec..8a42d1f 100644
126--- a/tests/auto/auto.pro 126--- a/tests/auto/auto.pro
127+++ b/tests/auto/auto.pro 127+++ b/tests/auto/auto.pro
128@@ -1,14 +1,16 @@ 128@@ -1,15 +1,17 @@
129 TEMPLATE=subdirs 129 TEMPLATE=subdirs
130-SUBDIRS=\ 130-SUBDIRS=\
131- linguist \ 131- linguist \
@@ -136,7 +136,8 @@ index a703a06..44bae18 100644
136- qhelpprojectdata \ 136- qhelpprojectdata \
137- cmake \ 137- cmake \
138- installed_cmake \ 138- installed_cmake \
139- qtdiag 139- qtdiag \
140- windeployqt
140+!linguistonly { 141+!linguistonly {
141+ SUBDIRS=\ 142+ SUBDIRS=\
142+ linguist \ 143+ linguist \
@@ -146,12 +147,13 @@ index a703a06..44bae18 100644
146+ qhelpindexmodel \ 147+ qhelpindexmodel \
147+ qhelpprojectdata \ 148+ qhelpprojectdata \
148+ cmake \ 149+ cmake \
149+ installed_cmake 150+ installed_cmake \
150+ qtdiag 151+ qtdiag \
152+ windeployqt
151+} 153+}
152 154
153 installed_cmake.depends = cmake 155 installed_cmake.depends = cmake
154 156
155-- 157--
1562.4.2 1582.5.3
157 159
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
index 71776528..7496a4a4 100644
--- 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
@@ -1,4 +1,4 @@
1From b0f96a829a7a04400f6a8b6cb14756db175c8e03 Mon Sep 17 00:00:00 2001 1From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30-- 30--
312.4.2 312.5.3
32 32
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index 0c3842eb..55506f8b 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From a4438a8c93e9846f1057dd7a21cbb41183440ec1 Mon Sep 17 00:00:00 2001 1From ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/3] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.4.2 502.5.3
51 51