summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:13:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:27 +0100
commitb0862a5cf2ba2878e7fefa5193acae3a82ea46fd (patch)
tree2281286b22e424616e1889a6077fcd6d5415dbec /meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
parentee14710dbf1c4383ca20851529684f164883cc80 (diff)
downloadpoky-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/0006-freetype-host-includes.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
new file mode 100644
index 0000000000..effc5f14d0
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
@@ -0,0 +1,25 @@
1From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH] freetype host includes
5
6Host include path should not be used in cross compiling case.
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Pending
10
11---
12 config.tests/unix/freetype/freetype.pri | 2 +-
13 1 files changed, 1 insertions(+), 1 deletions(-)
14
15Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
16===================================================================
17--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100
18+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100
19@@ -1,5 +1,5 @@
20 !cross_compile {
21- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
22+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
23 # LSB doesn't allow using headers from /include or /usr/include
24 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
25 for(p, TRY_INCLUDEPATHS) {