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:17 +0100 |
| commit | 24bf06bbcda4c0dfdad33cdff6394faa52657bb9 (patch) | |
| tree | 5c841fe411948bacc3716fb2509e3d9c4c1a391a /meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch | |
| parent | 5f0684c1d23a3520095a4d450a0c1fa95fa1c7b2 (diff) | |
| download | openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.tar.gz openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.tar.bz2 openembedded-core-24bf06bbcda4c0dfdad33cdff6394faa52657bb9.zip | |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 @@ -From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 -From: Michael Krelin <hacker@klever.net> -Date: Sat, 2 Jun 2007 16:06:59 +0200 -Subject: [PATCH] no qmake - -qmake is already built in qt4-tools-native, so disable it - -Ported from OE by: Yu Ke <ke.yu@intel.com> -Upstream-Status: Inappropriate [configuration] - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: qt-embedded-linux-opensource-src-4.4.3/configure -=================================================================== ---- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100 -@@ -3786,7 +3786,7 @@ - } - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= |