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-11-27 13:48:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-09 11:06:30 +0100
commit54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch)
tree479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
parent5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff)
downloadmeta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently 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-.patch8
1 files changed, 4 insertions, 4 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 d89f3446..6a428ed2 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 36b89f6e50e2b28d8646a5e77cdac36ecbd6ba4f Mon Sep 17 00:00:00 2001 1From 9089bf90632ffc983625816c5b0f2f2509ffc176 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 3f05383..d6ff774 100755 16index bd43281..d331711 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3868,6 +3868,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 19@@ -3874,6 +3874,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
@@ -26,5 +26,5 @@ index 3f05383..d6ff774 100755
26 echo "Running configuration tests..." 26 echo "Running configuration tests..."
27 27
28-- 28--
292.1.1 292.1.3
30 30