From a1a62c871a47a92e3712845283f6163f6f892109 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 3 Mar 2015 18:25:41 +0100 Subject: qtwebengine: Fix build if qtbase has no accessibility * backport patch from 5.4 branch to 5.4.1 release * bump SRCREV in git recipe to use newer revision from 5.4 which already includes this patch Signed-off-by: Stephan Binner Signed-off-by: Martin Jansa --- .../0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 2 +- .../0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 2 +- .../0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine-git') diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index c07ada66..f9267dcf 100644 --- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch @@ -1,4 +1,4 @@ -From 6e9a0fa4c1e3681deed659c2749223025637b38b Mon Sep 17 00:00:00 2001 +From 09f65b11a89e90ac115fad2403d22c723b287f31 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jun 2014 20:08:17 +0200 Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 91f9724c..cbd67cf7 100644 --- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -1,4 +1,4 @@ -From 418d78e063a47c4a3085ad7761fa1b842775637b Mon Sep 17 00:00:00 2001 +From 22c68425fb780c435267a867677ec0f54d7dbcd2 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 18 Nov 2014 10:38:18 +0100 Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 6e9def9f..57bac32a 100644 --- a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 6c8d9e121920519a831ca09f747ed77dfc2bd135 Mon Sep 17 00:00:00 2001 +From c2b2432649b15b4d7fcec24dd68501c4613e010a Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform -- cgit v1.2.3-54-g00ecf