summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
deleted file mode 100644
index e02815b1..00000000
--- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH] 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 | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b4c9602..f30ec1f 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
22 src_plugins.depends += src_gui src_platformsupport
23 !contains(QT_CONFIG, no-widgets) {
24- SUBDIRS += src_tools_uic src_widgets
25+ SUBDIRS += src_widgets
26 src_plugins.depends += src_widgets
27 contains(QT_CONFIG, opengl(es1|es2)?) {
28 SUBDIRS += src_opengl
29@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
30 }
31 }
32 }
33-SUBDIRS += src_plugins src_tools_qdoc
34+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
35
36 nacl: SUBDIRS -= src_network src_testlib
37
38--
391.8.3.2
40