summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-10-18 12:44:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-30 14:15:29 +0100
commit69b7d8f725b0c431d61a224dbf13a7575531404f (patch)
tree645ba6820f43750ca643ec997091a88fd92d210e /recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
parent9a4c0b393bf031acace5c2cc00d625a24c639d1c (diff)
downloadmeta-qt5-69b7d8f725b0c431d61a224dbf13a7575531404f.tar.gz
qt5: upgrade git recipes to 5.4-beta1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
index c9941206..d89f3446 100644
--- a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,4 +1,4 @@
1From f1b4d7d4c96b6ded9bd312f6db2ba735feb001c0 Mon Sep 17 00:00:00 2001 1From 36b89f6e50e2b28d8646a5e77cdac36ecbd6ba4f Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500 3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH 12/12] configure: preserve built qmake and swap with native 4Subject: [PATCH 12/12] configure: preserve built qmake and swap with native
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
13 1 file changed, 2 insertions(+) 13 1 file changed, 2 insertions(+)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index fe6bed4..ea661a3 100755 16index 3f05383..d6ff774 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3839,6 +3839,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 19@@ -3868,6 +3868,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
20 20
21 (cd "$outpath/qmake"; "$MAKE") || exit 2 21 (cd "$outpath/qmake"; "$MAKE") || exit 2
22 fi # Build qmake 22 fi # Build qmake