From 8f765ed71128ecc50aa7cd464be1332658df6e10 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 23 Sep 2015 16:56:26 +0200 Subject: qt5: upgrade to latest revision in 5.5 branches * qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream Signed-off-by: Martin Jansa --- ...002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch') diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 9df1c046..14481976 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -1,7 +1,7 @@ -From 4b5d3c736714b2712d7f3a77ea5a8a76fea0fc1f Mon Sep 17 00:00:00 2001 +From 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 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 +Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch @@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 98cff24..aec54ea 100644 +index 5689ce0..e71e6e4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) { @@ -25,5 +25,5 @@ index 98cff24..aec54ea 100644 for(ext, $$list($${QMAKE_EXT_CPP})): \ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- -2.4.2 +2.5.3 -- cgit v1.2.3-54-g00ecf