diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:14:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:14 +0200 |
commit | 04240161ef8ec0f584c68485abc02778786c5e75 (patch) | |
tree | d02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |
parent | 932b32c1c9e9a3ac833c82ff9273683345056ec7 (diff) | |
download | meta-qt5-04240161ef8ec0f584c68485abc02778786c5e75.tar.gz |
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance
* I plan to apply this to fido branch (as well as final upgrade to 5.4.2
recipes
* I'm preparing similar patch for 5.5 revisions, which will be applied
only in master branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index cbd67cf7..8d1c5fd1 100644 --- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22c68425fb780c435267a867677ec0f54d7dbcd2 Mon Sep 17 00:00:00 2001 | 1 | From cfe706846298d41defbf0386f85b17e70108b7af 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/3] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to |
@@ -25,5 +25,5 @@ index 64c08ad..b46478b 100644 | |||
25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | 26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) |
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||