* QT_VERSION allows to use 5.3.1 e.g. when overriding SRCREV
* ${includedir}/${QT_DIR_NAME} is the default value of
OE_QMAKE_PATH_QT_HEADERS, but
when it's changed by user we should respect it here
Signed-off-by: Martin Jansa <[email protected]>
---
recipes-qt/qt5/qtwayland_git.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 239b3ce..28a3760 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -10,8 +10,10 @@ SRC_URI += " \
file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
"
+QT_VERSION ?= "5.3.0"
+
do_install_append() {
# do install files created by qtwaylandscanner
- install
${B}/include/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-*.h
${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
- install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/*protocol*.h
${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
+ install
${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/qwayland-server-*.h
${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private
+ install
${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h
${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private
}
--
2.0.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
