The architecture independent data were being added to the '-dev' package however it shouldn't be. For example the QtWebEngine had the translation and the resources package were not being installed with the main package, as it should be.
This commit changes the qttools and qttranslations recipes as well so those keep its contents in the respective packages: qttools: add the phrasebooks in the qttools-tools package qttranslations: add a new subpackage for qtquickcontrols Signed-off-by: Otavio Salvador <[email protected]> --- recipes-qt/qt5/qt5.inc | 2 +- recipes-qt/qt5/qttools.inc | 1 + recipes-qt/qt5/qttranslations.inc | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index bb0bcdc..af0a906 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -118,7 +118,6 @@ FILES_${PN}-dev += " \ ${OE_QMAKE_PATH_LIBS}/cmake/* \ ${OE_QMAKE_PATH_LIBS}/*.prl \ ${OE_QMAKE_PATH_LIBS}/*.la \ - ${OE_QMAKE_PATH_DATA}/* \ ${OE_QMAKE_PATH_HEADERS}/* \ " FILES_${PN}-dbg += " \ @@ -129,6 +128,7 @@ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " FILES_${PN}-examples = " \ + ${OE_QMAKE_PATH_EXAMPLES}/README \ ${OE_QMAKE_PATH_EXAMPLES}/*/* \ " FILES_${PN}-examples-dev = " \ diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc index 8c97e24..97717ae 100644 --- a/recipes-qt/qt5/qttools.inc +++ b/recipes-qt/qt5/qttools.inc @@ -7,6 +7,7 @@ SRC_URI += " \ file://0003-add-noqtwebkit-configuration.patch \ " +FILES_${PN}-tools += "${datadir}/${QT_DIR_NAME}/phrasebooks" FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" PACKAGECONFIG ??= "" diff --git a/recipes-qt/qt5/qttranslations.inc b/recipes-qt/qt5/qttranslations.inc index c04aee6..c522694 100644 --- a/recipes-qt/qt5/qttranslations.inc +++ b/recipes-qt/qt5/qttranslations.inc @@ -16,6 +16,7 @@ PACKAGES =. " \ ${PN}-qtmultimedia \ ${PN}-qtlocation \ ${PN}-qtdeclarative \ + ${PN}-qtquickcontrols \ ${PN}-qtxmlpatterns \ ${PN}-qtconfig \ ${PN}-qtquick1 \ @@ -57,6 +58,10 @@ FILES_${PN}-qtdeclarative = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtdeclarative_*.qm \ " +FILES_${PN}-qtquickcontrols = " \ + ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \ +" + FILES_${PN}-qtxmlpatterns = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ " -- 2.1.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
