qtbase-native: Apply 0001-Always-build-uic.patch for all versions
* when uic does not exist in QT_EXTERNAL_HOST_BINS it will silently switch to /usr/bin/qt5/uic and build will fail a bit later Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
d060f11aa5
commit
956abd44cc
|
@ -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
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From ebe1148e38c5deb3c67dc041e68cd1623531d67b 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.
|
||||
|
||||
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.2.1
|
||||
|
|
@ -9,6 +9,7 @@ inherit native qmake5_base
|
|||
|
||||
QT_MODULE = "qtbase"
|
||||
|
||||
# shared with target qtbase
|
||||
SRC_URI += " \
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
||||
|
@ -21,6 +22,9 @@ SRC_URI += " \
|
|||
file://0012-wayland-scanner-disable-silent-rules.patch \
|
||||
"
|
||||
|
||||
# specific for native version
|
||||
SRC_URI += "file://0001-Always-build-uic.patch"
|
||||
|
||||
SEPB = "${WORKDIR}/build"
|
||||
B = "${SEPB}"
|
||||
|
||||
|
|
|
@ -3,7 +3,5 @@ require ${PN}.inc
|
|||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://0001-Always-build-uic.patch"
|
||||
|
||||
SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e"
|
||||
SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500"
|
||||
|
|
|
@ -3,7 +3,5 @@ require ${PN}.inc
|
|||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://0001-Always-build-uic.patch"
|
||||
|
||||
SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
|
||||
SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
|
||||
|
|
Loading…
Reference in New Issue