qmake5_paths.bbclass: Use Qt version path for headers

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.

(From meta-qt5 rev: 2bd5fba34dd350807ac07828cd883d5b6c7ec631)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/classes/qmake5_paths.bbclass b/meta-qt5/classes/qmake5_paths.bbclass
index 2b5bf4b..8f91e93 100644 (file)
--- a/meta-qt5/classes/qmake5_paths.bbclass
+++ b/meta-qt5/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}"