qt5.inc: Fix packaging of architecture independent data

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 <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador
2015-02-08 19:24:10 -02:00
parent 7b615428cf
commit 247aeca877
3 changed files with 7 additions and 1 deletions

View File

@@ -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 = " \

View File

@@ -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 ??= ""

View File

@@ -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 \
"