diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |
parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
download | meta-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/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 | 20 |
1 files changed, 11 insertions, 9 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 @@ | |||
1 | From 5d1c8cdf5d448d5b3f719447dae3a59340348d2e Mon Sep 17 00:00:00 2001 | 1 | From 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [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 | ||
21 | diff --git a/examples/examples.pro b/examples/examples.pro | 21 | diff --git a/examples/examples.pro b/examples/examples.pro |
22 | index 69365d1..da7b38b 100644 | 22 | index 69365d1..da7b38b 100644 |
@@ -122,10 +122,10 @@ index 494898f..c02848d 100644 | |||
122 | qtNomakeTools( \ | 122 | qtNomakeTools( \ |
123 | pixeltool \ | 123 | pixeltool \ |
124 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro | 124 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro |
125 | index a703a06..44bae18 100644 | 125 | index 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 | -- |
156 | 2.4.2 | 158 | 2.5.3 |
157 | 159 | ||