diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:13:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:27 +0100 |
commit | b0862a5cf2ba2878e7fefa5193acae3a82ea46fd (patch) | |
tree | 2281286b22e424616e1889a6077fcd6d5415dbec /meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch | |
parent | ee14710dbf1c4383ca20851529684f164883cc80 (diff) | |
download | poky-b0862a5cf2ba2878e7fefa5193acae3a82ea46fd.tar.gz |
qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus
(From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d)
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, 27 insertions, 0 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 new file mode 100644 index 0000000000..ed50c6df53 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch | |||
@@ -0,0 +1,27 @@ | |||
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= | ||