Patchwork [meta-qt5,dora,backport] qmake5_paths.bbclass: Use Qt version path for headers

login
register
mail settings
Submitter Koen Kooi
Date May 19, 2014, 1:38 p.m.
Message ID <1400506701-28686-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/72367/
State Rejected, archived
Headers show

Comments

Koen Kooi - May 19, 2014, 1:38 p.m.
From: Otavio Salvador <otavio@ossystems.com.br>

When looking for Qt5 headers we ought to use the Qt5 specific path. In
case the distribution wants to have a flat tree it can set QT_DIR_NAME
and it will still works as expected.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/qmake5_paths.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass
index 2b5bf4b..8f91e93 100644
--- a/classes/qmake5_paths.bbclass
+++ b/classes/qmake5_paths.bbclass
@@ -5,7 +5,7 @@ 
 QT_DIR_NAME ?= "qt5"
 
 OE_QMAKE_PATH_PREFIX = "${prefix}"
-OE_QMAKE_PATH_HEADERS = "${includedir}"
+OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
 OE_QMAKE_PATH_LIBS = "${libdir}"
 OE_QMAKE_PATH_ARCHDATA = "${libdir}"
 OE_QMAKE_PATH_DATA = "${datadir}"