summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-05-30 14:37:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:11:51 +0200
commitcf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff (patch)
treea9bd7e40b22d3ccf789a0506a4c2fc7c30593d6f /recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
parenta0da57e5ce2862758e10b82c30c200e365b29f46 (diff)
downloadmeta-qt5-cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff.tar.gz
recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
new file mode 100644
index 00000000..f425c3e7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
@@ -0,0 +1,31 @@
1From dd679f743291a924bed500a866eb05fab71c9978 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 6/8] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index 6a805a6..90623a6 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 }
22 }
23 }
24-SUBDIRS += src_plugins src_tools_qdoc
25+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
26
27 nacl: SUBDIRS -= src_network src_testlib
28
29--
302.0.0
31