diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index 3e8d7acc..4587219e 100644 --- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 1e2fbd3bbf3eb94a4d78c53068bbb58d4227ab46 Mon Sep 17 00:00:00 2001 | 1 | From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH 1/2] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
5 | anywhere in patch, but at the end | 5 | anywhere in path, but at the end |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 02c3872..3b9babe 100644 | 13 | index acf15a8..08b2642 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) { | 16 | @@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) { |
17 | defineReplace(mocOutput) { | 17 | defineReplace(mocOutput) { |
18 | out = $$1 | 18 | out = $$1 |
19 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 19 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
@@ -25,5 +25,5 @@ index 02c3872..3b9babe 100644 | |||
25 | } | 25 | } |
26 | 26 | ||
27 | -- | 27 | -- |
28 | 2.1.1 | 28 | 2.1.3 |
29 | 29 | ||