diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-08-25 14:43:44 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-26 17:21:13 +0200 |
| commit | f969c48953359c75199634867ab8e1d775b7e747 (patch) | |
| tree | 913593731b77a35032298972b5770091cd31bddb /recipes-qt | |
| parent | c44912563c4eadc288050f0b5e25981bc432d3f7 (diff) | |
qt5: improve Qt module package handling
Make it simpler to add Qt modules to image and toolchain, without need
to specify each subpackage separately. All Qt modules should provide
the ${PN} package, so create it even if empty. Make the ${PN} package
also recommend all subpackages that are normally required at run time,
namely plugins. Do the same for ${PN}-dev and ${PN}-dbg packages.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index d0309ae4..ef849bf6 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -47,6 +47,24 @@ INSANE_SKIP_${PN}-examples-dev += "libdir" PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dbg = "1" + +RRECOMMENDS_${PN} = " \ + ${PN}-plugins \ + ${PN}-qmlplugins \ + " + +RRECOMMENDS_${PN}-dev = " \ + ${PN} \ + ${PN}-mkspecs \ + " + +RRECOMMENDS_${PN}-dbg = " \ + ${PN}-plugins-dbg \ + ${PN}-qmlplugins-dbg \ + " + # extra -dbg packages FILES_${PN}-qmlplugins-dbg = " \ ${OE_QMAKE_PATH_QML}/*/.debug \ @@ -138,8 +156,7 @@ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " FILES_${PN}-examples = " \ - ${OE_QMAKE_PATH_EXAMPLES}/README \ - ${OE_QMAKE_PATH_EXAMPLES}/*/* \ + ${OE_QMAKE_PATH_EXAMPLES}/* \ " FILES_${PN}-examples-dev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \ |