summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-10-19 14:50:16 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-23 13:08:53 +0200
commit89038bffd224a0d43aa8627472374503b3023f61 (patch)
treef618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
parent37693b5357e790665bce4957cb7a8d5d2423390d (diff)
downloadmeta-qt5-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/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index cceba8d4..02381e04 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,4 +1,4 @@
1From f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001 1From cf7f63dfcf71b7baee30112ef73fed67504033f7 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -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
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 69d3fd3..5689ce0 100644 13index 64064bd..8287c8f 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@@ -98,9 +98,9 @@ defineReplace(mocOutput) { 16@@ -105,9 +105,9 @@ defineReplace(mocOutput) {
17 out = $$1 17 out = $$1
18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
19 for(ext, $$list($${QMAKE_EXT_CPP})): \ 19 for(ext, $$list($${QMAKE_EXT_CPP})): \
@@ -26,5 +26,5 @@ index 69d3fd3..5689ce0 100644
26 } 26 }
27 27
28-- 28--
292.5.3 292.6.1
30 30