diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-06 12:52:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-07 11:01:59 +0200 |
commit | 956abd44cc676af060f905c9b5c570f65bb983d3 (patch) | |
tree | 17d2d5ee7104029ed044eda8feac3da0b109e1f4 | |
parent | d060f11aa5acdba61afa69c935c35334c8fea613 (diff) | |
download | meta-qt5-956abd44cc676af060f905c9b5c570f65bb983d3.tar.gz |
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>
-rw-r--r-- | recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch | 31 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch | 40 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_5.0.0.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_5.0.1.bb | 2 |
5 files changed, 75 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch new file mode 100644 index 00000000..3f2e3fd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 27 Nov 2012 12:46:44 -0800 | ||
4 | Subject: [PATCH] Always build uic | ||
5 | |||
6 | Even if we are not building gui or widgets. This tool is needed later | ||
7 | as a native tool when compiling the target. | ||
8 | |||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
10 | --- | ||
11 | src/tools/tools.pro | 4 ++-- | ||
12 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/src/tools/tools.pro b/src/tools/tools.pro | ||
15 | index c67d6bf..b6f3b39 100644 | ||
16 | --- a/src/tools/tools.pro | ||
17 | +++ b/src/tools/tools.pro | ||
18 | @@ -1,8 +1,8 @@ | ||
19 | TEMPLATE = subdirs | ||
20 | |||
21 | -TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc | ||
22 | +TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic | ||
23 | contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml | ||
24 | -!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic | ||
25 | + | ||
26 | # Set subdir and respective target name | ||
27 | src_tools_bootstrap.subdir = $$PWD/bootstrap | ||
28 | src_tools_bootstrap.target = sub-tools-bootstrap | ||
29 | -- | ||
30 | 1.7.4.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch new file mode 100644 index 00000000..a0810bcc --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From ebe1148e38c5deb3c67dc041e68cd1623531d67b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 27 Nov 2012 12:46:44 -0800 | ||
4 | Subject: [PATCH] Always build uic | ||
5 | |||
6 | Even if we are not building gui or widgets. This tool is needed later | ||
7 | as a native tool when compiling the target. | ||
8 | |||
9 | Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 | ||
10 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | src/src.pro | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/src.pro b/src/src.pro | ||
17 | index 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 | -- | ||
39 | 1.8.2.1 | ||
40 | |||
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 9f7b0f71..d5f23b99 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -9,6 +9,7 @@ inherit native qmake5_base | |||
9 | 9 | ||
10 | QT_MODULE = "qtbase" | 10 | QT_MODULE = "qtbase" |
11 | 11 | ||
12 | # shared with target qtbase | ||
12 | SRC_URI += " \ | 13 | SRC_URI += " \ |
13 | file://0001-Add-linux-oe-g-platform.patch \ | 14 | file://0001-Add-linux-oe-g-platform.patch \ |
14 | file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 15 | file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
@@ -21,6 +22,9 @@ SRC_URI += " \ | |||
21 | file://0012-wayland-scanner-disable-silent-rules.patch \ | 22 | file://0012-wayland-scanner-disable-silent-rules.patch \ |
22 | " | 23 | " |
23 | 24 | ||
25 | # specific for native version | ||
26 | SRC_URI += "file://0001-Always-build-uic.patch" | ||
27 | |||
24 | SEPB = "${WORKDIR}/build" | 28 | SEPB = "${WORKDIR}/build" |
25 | B = "${SEPB}" | 29 | B = "${SEPB}" |
26 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb index 1ee1693e..f791b600 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.0.bb | |||
@@ -3,7 +3,5 @@ require ${PN}.inc | |||
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | SRC_URI += "file://0001-Always-build-uic.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" | 6 | SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" |
9 | SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" | 7 | SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" |
diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb index e1c5118b..2dce2c1d 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb | |||
@@ -3,7 +3,5 @@ require ${PN}.inc | |||
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | SRC_URI += "file://0001-Always-build-uic.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" | 6 | SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" |
9 | SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" | 7 | SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" |