blob: cbd67cf7014a15b0d00913de2a39e0ed003557e9 (
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
27
28
29
|
From 22c68425fb780c435267a867677ec0f54d7dbcd2 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
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 <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 64c08ad..b46478b 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -85,7 +85,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.3.1
|
