diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | aea363afaa193feee774dad30d81c516ea4a98fc (patch) | |
tree | 00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch | |
parent | 425df23c02b7dad3c843ec9959a51337ab450cd1 (diff) | |
download | poky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch deleted file mode 100644 index ed50c6df53..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Sat, 2 Jun 2007 16:06:59 +0200 | ||
4 | Subject: [PATCH] no qmake | ||
5 | |||
6 | qmake is already built in qt4-tools-native, so disable it | ||
7 | |||
8 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | --- | ||
12 | configure | 2 +- | ||
13 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
14 | |||
15 | Index: qt-embedded-linux-opensource-src-4.4.3/configure | ||
16 | =================================================================== | ||
17 | --- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100 | ||
18 | +++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100 | ||
19 | @@ -3786,7 +3786,7 @@ | ||
20 | } | ||
21 | |||
22 | # build qmake | ||
23 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
24 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
25 | echo "Creating qmake. Please wait..." | ||
26 | |||
27 | OLD_QCONFIG_H= | ||