diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-02-24 20:50:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-26 11:15:07 +0000 |
commit | 1adeb37d79575d1056a4ef744b03a2762728c973 (patch) | |
tree | cc9bdafb86715fe211ea3779592936d932d25591 | |
parent | 5ecae0be86a70ad78aec69b7799deb0e83183dbc (diff) | |
download | poky-1adeb37d79575d1056a4ef744b03a2762728c973.tar.gz |
qt4-native: set headerdir as done in regular builds
qmake uses a generated qt.conf file that expects headers to be found
at ${includedir}/qt4 but qt4-native were not following this layout
breaking the builds of native binaries that use qt4.
(From OE-Core rev: 7828bf71babd965b263249f4a24ecfe58e97cc0b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-qt/qt4/qt4-native.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 86f2440375..70adec40fc 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | |||
9 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | 9 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ |
10 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | 10 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" |
11 | 11 | ||
12 | INC_PR = "r13" | 12 | INC_PR = "r14" |
13 | 13 | ||
14 | inherit native | 14 | inherit native |
15 | 15 | ||
@@ -29,6 +29,7 @@ EXTRA_OECONF = "-prefix ${prefix} \ | |||
29 | -no-nas-sound \ | 29 | -no-nas-sound \ |
30 | -no-nis -no-openssl \ | 30 | -no-nis -no-openssl \ |
31 | -verbose -release \ | 31 | -verbose -release \ |
32 | -headerdir ${includedir}/qt4 \ | ||
32 | -embedded -no-freetype -no-glib -no-iconv \ | 33 | -embedded -no-freetype -no-glib -no-iconv \ |
33 | -exceptions -xmlpatterns \ | 34 | -exceptions -xmlpatterns \ |
34 | -qt3support \ | 35 | -qt3support \ |