Patchwork [1/2] qt4-native: set headerdir as done in regular builds

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 24, 2012, 8:50 p.m.
Message ID <9aa5ec041b1a46187ea8c2487a9d14efc3781818.1330116559.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/21971/
State Accepted
Commit 7828bf71babd965b263249f4a24ecfe58e97cc0b
Headers show

Comments

Otavio Salvador - Feb. 24, 2012, 8:50 p.m.
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.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 86f2440..70adec4 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 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 inherit native
 
@@ -29,6 +29,7 @@  EXTRA_OECONF = "-prefix ${prefix} \
                 -no-nas-sound \
                 -no-nis -no-openssl \
                 -verbose -release \
+                -headerdir ${includedir}/qt4 \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -exceptions -xmlpatterns \
                 -qt3support \