From 69b7d8f725b0c431d61a224dbf13a7575531404f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 18 Oct 2014 12:44:07 +0200 Subject: qt5: upgrade git recipes to 5.4-beta1 Signed-off-by: Martin Jansa --- .../0012-configure-preserve-built-qmake-and-swap-with-native-.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch') 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 @@ -From f1b4d7d4c96b6ded9bd312f6db2ba735feb001c0 Mon Sep 17 00:00:00 2001 +From 36b89f6e50e2b28d8646a5e77cdac36ecbd6ba4f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:22:34 -0500 Subject: [PATCH 12/12] configure: preserve built qmake and swap with native @@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index fe6bed4..ea661a3 100755 +index 3f05383..d6ff774 100755 --- a/configure +++ b/configure -@@ -3839,6 +3839,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3868,6 +3868,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake -- cgit v1.2.3-54-g00ecf