diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-01 17:36:38 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:45 +0200 |
commit | 26b7fee65a3c23a9c2447d549668f373bfa76bae (patch) | |
tree | fca7565930f8d7705cb5d96c5bc5ce6d7e561a0c /recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |
parent | 0663bcdddf0311329e607416cd51ce55b9557240 (diff) | |
download | meta-qt5-26b7fee65a3c23a9c2447d549668f373bfa76bae.tar.gz |
qtwebengine: Add 2 more patches to fix do_configure and fix QA warning
* otherwise moc generated files have the same basename and do_configure fails with:
core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
| javascript_dialog_controller: javascript_dialog_controller.cpp
| /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
...
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch new file mode 100644 index 00000000..d9b75eb0 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From fd954d63f62c551c5aeaab662b7ab42a3f2ab527 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | ||
4 | Subject: [PATCH 2/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | ||
5 | anywhere in patch, but at the end | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | tools/qmake/mkspecs/features/functions.prf | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
13 | index 8725fd2..15c2941 100644 | ||
14 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
16 | @@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) { | ||
17 | defineReplace(mocOutput) { | ||
18 | out = $$1 | ||
19 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
20 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
21 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
22 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
23 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
24 | return($$out) | ||
25 | } | ||
26 | |||
27 | -- | ||
28 | 2.0.0 | ||
29 | |||