diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index d95e0b45..7bd2ba6b 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 | 1 | From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 05/15] qmake is already built in qtbase-native | 4 | Subject: [PATCH 05/23] qmake is already built in qtbase-native |
5 | 5 | ||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | 6 | Ported from OE by: Yu Ke <ke.yu@intel.com> |
7 | Upstream-Status: Inappropriate [configuration] | 7 | Upstream-Status: Inappropriate [configuration] |
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index 65f4d26..dbf99a9 100755 | 16 | index 25980c0..74f9e65 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() | 19 | @@ -4022,7 +4022,7 @@ setBootstrapEvalVariable() |
20 | 20 | ||
21 | 21 | ||
22 | # build qmake | 22 | # build qmake |
@@ -26,5 +26,5 @@ index 65f4d26..dbf99a9 100755 | |||
26 | 26 | ||
27 | mkdir -p "$outpath/qmake" || exit | 27 | mkdir -p "$outpath/qmake" || exit |
28 | -- | 28 | -- |
29 | 1.8.2.1 | 29 | 1.8.3.2 |
30 | 30 | ||