summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
diff options
context:
space:
mode:
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.patch26
1 files changed, 0 insertions, 26 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 93e68b51..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-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
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 0333bdd1..687d34f8 100644
15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -316,7 +316,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 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})