qt5-native: Always compile and install uic
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
This commit is contained in:
parent
ead13659ca
commit
05d88f867d
|
@ -0,0 +1,31 @@
|
|||
From 1092de02d1ac256a8c56fb5b5e590a4df8188acb 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] 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.
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
---
|
||||
src/tools/tools.pro | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
|
||||
index c67d6bf..b6f3b39 100644
|
||||
--- a/src/tools/tools.pro
|
||||
+++ b/src/tools/tools.pro
|
||||
@@ -1,8 +1,8 @@
|
||||
TEMPLATE = subdirs
|
||||
|
||||
-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
|
||||
+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
|
||||
contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
|
||||
-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
|
||||
+
|
||||
# Set subdir and respective target name
|
||||
src_tools_bootstrap.subdir = $$PWD/bootstrap
|
||||
src_tools_bootstrap.target = sub-tools-bootstrap
|
||||
--
|
||||
1.7.4.1
|
||||
|
|
@ -14,6 +14,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
|
|||
|
||||
SRC_URI += " \
|
||||
file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
|
||||
file://0001-Always-build-uic.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
|
@ -55,7 +56,7 @@ do_configure() {
|
|||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}/
|
||||
for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt; do
|
||||
for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt uic; do
|
||||
install -v -m 0755 bin/${i} ${D}${bindir}/${i}
|
||||
done
|
||||
install -d ${D}${datadir}/qt5/
|
||||
|
|
Loading…
Reference in New Issue