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/qtwebengine | |
| parent | 096112d4ab8bad1c45ab0bc40354d9a9bb3e097d (diff) | |
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/qtwebengine')
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch b/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch index 397929f4..bd4e8679 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch @@ -1,4 +1,4 @@ -From daf8cd1ccd533d5546ff3a11d19710e0f155cc68 Mon Sep 17 00:00:00 2001 +From c2defbfe5946a6c483e3f9df37fb16bdffeffc31 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Fri, 20 Jun 2014 09:09:12 +0200 Subject: [PATCH 1/3] Use ninja supplied by environment variable NINJA_PATH @@ -32,5 +32,5 @@ index 4dcd8ed..8725fd2 100644 + return($$NINJA_PATH) } -- -2.0.0 +2.1.1 diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index d9b75eb0..b5fc71dd 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch @@ -1,4 +1,4 @@ -From fd954d63f62c551c5aeaab662b7ab42a3f2ab527 Mon Sep 17 00:00:00 2001 +From 32f3b53d0b5861ac3e277552b04a579d8bd16558 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jun 2014 20:08:17 +0200 Subject: [PATCH 2/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H @@ -25,5 +25,5 @@ index 8725fd2..15c2941 100644 } -- -2.0.0 +2.1.1 diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch index bc5a75cc..173f7f73 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-Try-to-add-_moc-suffix.patch @@ -1,4 +1,4 @@ -From 5089c3d10f13874e503f5548f40341d8f59e229f Mon Sep 17 00:00:00 2001 +From b0e844967728edf814d611bb1c69d320a8a6c64d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Tue, 1 Jul 2014 15:58:16 +0200 Subject: [PATCH 3/3] functions.prf: Try to add _moc suffix @@ -30,5 +30,5 @@ index 15c2941..78b1190 100644 } -- -2.0.0 +2.1.1 |