From 3ccdc239b02aca03dc1e9316b7c5c870b3b59368 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 16 Apr 2015 13:14:57 +0200 Subject: git-recipes: upgrade to latest revision in 5.4 branch * this gets us close to 5.4.2 for people who want to test it in advance * I plan to apply this to fido branch (as well as final upgrade to 5.4.2 recipes * I'm preparing similar patch for 5.5 revisions, which will be applied only in master branch Signed-off-by: Martin Jansa --- .../0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch') 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 cbd67cf7..8d1c5fd1 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 22c68425fb780c435267a867677ec0f54d7dbcd2 Mon Sep 17 00:00:00 2001 +From cfe706846298d41defbf0386f85b17e70108b7af 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 @@ -25,5 +25,5 @@ index 64c08ad..b46478b 100644 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -- -2.3.1 +2.3.5 -- cgit v1.2.3-54-g00ecf