diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-29 05:48:44 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:25:11 +0200 |
commit | be2d4815efd7b8312700a426a5cafcd86a93666b (patch) | |
tree | ef3c3ed2e3092535fe0e4a14d2834c1ccbd72d19 /recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | |
parent | 096112d4ab8bad1c45ab0bc40354d9a9bb3e097d (diff) | |
download | meta-qt5-be2d4815efd7b8312700a426a5cafcd86a93666b.tar.gz |
qt5: upgrade git recipes to 5.4-alpha1
* introduce 2nd set of qtwayland and qtwebengine recipes, because newer
revision isn't compatible with 5.3.2 release
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch index a1af18e1..9bd001b4 100644 --- a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 271db04ebfbaf67e2e8c30ff050510c5a42acfa4 Mon Sep 17 00:00:00 2001 | 1 | From 2dd5a897d7e2f073b4223595a7bf214d3481b68a Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 11/12] Always build uic | 4 | Subject: [PATCH 11/12] Always build uic |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 6a805a6..90623a6 100644 | 17 | index ab93641..a48606b 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -161,7 +161,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.0.0 | 30 | 2.1.1 |
31 | 31 | ||