From 54c44443c34f077bfc2c5cc3a92d6db59d28343c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Nov 2014 13:48:38 +0100 Subject: qt5-git: Update to rc1+, latest revision in 5.4 branch * qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently Signed-off-by: Martin Jansa --- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch (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 new file mode 100644 index 00000000..58218a56 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -0,0 +1,29 @@ +From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 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 + generate it's moc'ed abbreviation + +Signed-off-by: Simon Busch +Signed-off-by: Martin Jansa +--- + tools/qmake/mkspecs/features/functions.prf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf +index 08b2642..0123336 100644 +--- a/tools/qmake/mkspecs/features/functions.prf ++++ b/tools/qmake/mkspecs/features/functions.prf +@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) { + } + + defineReplace(mocOutput) { +- out = $$1 ++ in = $$1 ++ out = $$basename(in) + # The order is important, since the output of the second replace would end up accidentaly transformed by the first one + 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.1.3 + -- cgit v1.2.3-54-g00ecf