summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
blob: c5a057c0560b668a5b743c7144897b47459183e3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
From 35805156dff632f05a85cd0a30e4707d9ba2e093 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Tue, 18 Nov 2014 10:38:18 +0100
Subject: [PATCH] functions.prf: Make sure we only use the file name to
 generate it's moc'ed abbreviation

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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 6cf49f4..1287799 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -179,7 +179,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
   for(ext, $$list($${QMAKE_EXT_CPP})): \
       out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})