diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-18 20:07:53 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:56:48 +0000 |
commit | 808d65c129d283850fa6c1e887dd01f8ee86b64b (patch) | |
tree | 6aaa270319d34651537cb04295398d8894617539 /recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch | |
parent | a55a9936e29b4aaaebc742d52af3b61f738d10c5 (diff) | |
download | meta-qt5-808d65c129d283850fa6c1e887dd01f8ee86b64b.tar.gz |
qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
* in preparation for rebase on 5.12 #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..42d94190 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 4ac36e3e40bd8a4940f211cf89155618149f1f68 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | ||
4 | Subject: [PATCH] Always build uic and qvkgen | ||
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 | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/src.pro b/src/src.pro | ||
17 | index 1c76a2e46f..fbd4014fb3 100644 | ||
18 | --- a/src/src.pro | ||
19 | +++ b/src/src.pro | ||
20 | @@ -232,7 +232,7 @@ qtConfig(gui) { | ||
21 | } | ||
22 | } | ||
23 | } | ||
24 | -SUBDIRS += src_plugins | ||
25 | +SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen | ||
26 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | ||
28 | |||