diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |
parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
download | meta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
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 | 7 |
1 files changed, 2 insertions, 5 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 dbc1e24e..18f268ce 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,7 +1,7 @@ | |||
1 | From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001 | 1 | From 6576e3135b839b53c422befac0a233f6dd1966bf 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] functions.prf: Make sure we only use the file name to |
5 | generate it's moc'ed abbreviation | 5 | generate it's moc'ed abbreviation |
6 | 6 | ||
7 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 7 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
@@ -24,6 +24,3 @@ index 8d984c7..055e960 100644 | |||
24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
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 | -- | ||
28 | 2.7.0 | ||
29 | |||