summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.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/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.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/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 9bc13157..3ba66415 100644
--- a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,4 +1,4 @@
1From dcc588b11abdc12b4ed08534334e338f35d96ed1 Mon Sep 17 00:00:00 2001 1From 3442aad5295956c1a177bdf7ab73e1f0d86ab5fc Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build 4Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644
64 VPATH += \ 64 VPATH += \
65 ../src/corelib/global \ 65 ../src/corelib/global \
66-- 66--
672.5.3 672.6.1
68 68