[oe] [meta-qt5][PATCH] qt5: add one more subfolder for ${PN}-qmldesigner

Samuli Piippo samuli.piippo at qt.io
Thu Apr 21 07:39:48 UTC 2016


QtQuickControls2 has deeper folder structure, make sure that files
go to correct packages.

Signed-off-by: Samuli Piippo <samuli.piippo at qt.io>
---
 recipes-qt/qt5/qt5.inc                 | 1 +
 recipes-qt/qt5/qtquickcontrols2_git.bb | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 85d7d89..d3dc5f1 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -92,6 +92,7 @@ FILES_${PN}-plugins-dbg = " \
 FILES_${PN}-qmldesigner += " \
     ${OE_QMAKE_PATH_QML}/*/designer \
     ${OE_QMAKE_PATH_QML}/*/*/designer \
+    ${OE_QMAKE_PATH_QML}/*/*/*/designer \
 "
 
 # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 41c781e..269ffac 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,6 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative"
 
-FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
-
 SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218"
-- 
1.9.1




More information about the Openembedded-devel mailing list