diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-27 21:38:28 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-02 11:22:24 +0100 |
commit | e088f366191f9a4cadc815c3d72d85086619a184 (patch) | |
tree | cf2d1b499c9b5c0cfd37fac76caca2c97c69381d /recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |
parent | 7d5d2d3f6969dcde88a24b43b101bca8df08e5c8 (diff) | |
download | meta-qt5-e088f366191f9a4cadc815c3d72d85086619a184.tar.gz |
qt5: upgrade to latest revisions in 5.7 branches
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.patch | 6 |
1 files changed, 3 insertions, 3 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 index 72eec1b2..3662c441 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 75b06098b5780ba3eaa24d48dd90d91590a379d1 Mon Sep 17 00:00:00 2001 | 1 | From 958e5875c25f76e7431c86286305f289effcedf6 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to |
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 8d984c7..055e960 100644 | 14 | index 6ae413a..deaab83 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { |
@@ -25,5 +25,5 @@ index 8d984c7..055e960 100644 | |||
25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 25 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 26 | out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
27 | -- | 27 | -- |
28 | 2.7.0 | 28 | 2.7.1 |
29 | 29 | ||