diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 29 |
1 files changed, 0 insertions, 29 deletions
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 deleted file mode 100644 index 8cdf4ca8..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 323f3d4fbd00b8655a1928c389d5f05ef4526044 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | ||
4 | Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to | ||
5 | generate it's moc'ed abbreviation | ||
6 | |||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | tools/qmake/mkspecs/features/functions.prf | 3 ++- | ||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
14 | index 64c08ad..b46478b 100644 | ||
15 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
17 | @@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) { | ||
18 | } | ||
19 | |||
20 | defineReplace(mocOutput) { | ||
21 | - out = $$1 | ||
22 | + in = $$1 | ||
23 | + out = $$basename(in) | ||
24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
27 | -- | ||
28 | 2.3.1 | ||
29 | |||