2014-02-07 03:10:06 +00:00
|
|
|
From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001
|
2013-11-02 18:06:14 +00:00
|
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
|
|
Date: Sat, 16 Nov 2013 00:32:30 +0100
|
|
|
|
Subject: [PATCH 10/12] 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 b7887a6..8801544 100644
|
|
|
|
--- a/src/src.pro
|
|
|
|
+++ b/src/src.pro
|
|
|
|
@@ -145,7 +145,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
|
|
|
|
|
|
|
|
@@ -156,4 +156,4 @@ TR_EXCLUDE = \
|
|
|
|
src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
|
|
|
|
|
|
|
|
sub-tools.depends = $$TOOLS
|
|
|
|
-QMAKE_EXTRA_TARGETS = sub-tools
|
|
|
|
\ No newline at end of file
|
|
|
|
+QMAKE_EXTRA_TARGETS = sub-tools
|
|
|
|
--
|
2014-02-07 03:10:06 +00:00
|
|
|
1.8.5.3
|
2013-11-02 18:06:14 +00:00
|
|
|
|