diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 14:50:16 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 13:08:53 +0200 |
commit | 89038bffd224a0d43aa8627472374503b3023f61 (patch) | |
tree | f618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | |
parent | 37693b5357e790665bce4957cb7a8d5d2423390d (diff) | |
download | meta-qt5-upstream/jansa/jethro.tar.gz |
qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethro
* this is probably last upgrade for jethro branch, master will switch
to 5.6 soon
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch index 55dc557a..037b0e4e 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001 | 1 | From 324eab1b148df1e8330b2dbbd114ab696c163e46 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Mon, 11 May 2015 13:47:06 +0300 | 3 | Date: Mon, 11 May 2015 13:47:06 +0300 |
4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi | 4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi |
@@ -67,5 +67,5 @@ index 2a59966..317d24a 100644 | |||
67 | " 'target_defaults': {" \ | 67 | " 'target_defaults': {" \ |
68 | " 'target_conditions': [" \ | 68 | " 'target_conditions': [" \ |
69 | -- | 69 | -- |
70 | 2.5.3 | 70 | 2.6.1 |
71 | 71 | ||