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:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:52:48 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 14:52:48 +0200
commit3208763b8b3f65b17825ded4b2c9b9166d78f2b2 (patch)
tree9b4d2c0f4bf069f1f23c37e66be00041c192b271 /recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
parent3fa7bb148ed40bd018ce51b5f20c0c8792638568 (diff)
downloadmeta-qt5-3208763b8b3f65b17825ded4b2c9b9166d78f2b2.tar.gz
qt5: rename <module>-git directories with patches to just <module>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch29
1 files changed, 29 insertions, 0 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
new file mode 100644
index 00000000..8d1c5fd1
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -0,0 +1,29 @@
1From cfe706846298d41defbf0386f85b17e70108b7af Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/3] 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 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--
282.3.5
29