blob: 96c85f05d2812ca81a9674162171ef13ddb0a1cb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
Date: Tue, 27 Nov 2012 12:46:44 -0800
Subject: [PATCH 22/22] Always build uic
Even if we are not building gui or widgets. This tool is needed later
as a native tool when compiling the target.
Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/src.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/src.pro b/src/src.pro
index b4c9602..f30ec1f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
src_plugins.depends += src_gui src_platformsupport
!contains(QT_CONFIG, no-widgets) {
- SUBDIRS += src_tools_uic src_widgets
+ SUBDIRS += src_widgets
src_plugins.depends += src_widgets
contains(QT_CONFIG, opengl(es1|es2)?) {
SUBDIRS += src_opengl
@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
}
}
}
-SUBDIRS += src_plugins src_tools_qdoc
+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
nacl: SUBDIRS -= src_network src_testlib
--
1.8.3.1
|
