[meta-qt5][PATCH] qt5: package Qt Quick Designer files separately

[meta-qt5][PATCH] qt5: package Qt Quick Designer files separately

[Samuli Piippo]

Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
---
 recipes-qt/qt5/qt5.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..17d8fd7 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
 INSANE_SKIP_${PN}-examples-dbg += "libdir"
 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 "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmldesigner ${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"
@@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
 RRECOMMENDS_${PN}-dev = " \
     ${PN} \
     ${PN}-mkspecs \
+    ${PN}-qmldesigner \
     "
 
 RRECOMMENDS_${PN}-dbg = " \
@@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
 "
 
 # extra packages
+FILES_${PN}-qmldesigner += " \
+    ${OE_QMAKE_PATH_QML}/*/designer \
+    ${OE_QMAKE_PATH_QML}/*/*/designer \
+"
+
 # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
 FILES_${PN}-qmlplugins = " \
     ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
-- 
1.9.1

Re: [meta-qt5][PATCH] qt5: package Qt Quick Designer files separately

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3132 bytes --]

On Wed, Sep 02, 2015 at 12:32:39PM +0300, Samuli Piippo wrote:
> Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
> files for Qt Quick Designer integration, which are not needed in the image.
> Create new ${PN}-qmldesigner package that includes those files instead of
> ${PN}-qmlplugins.

This breaks qtwebkit:

ERROR: Nothing RPROVIDES 'qtwebkit-qmldesigner' (but
/home/jenkins/oe/world/shr-core/meta-qt5/recipes-qt/qt5/qtwebkit_git.bb
RDEPENDS on or otherwise requires it)

NOTE: Runtime target 'qtwebkit-qmldesigner' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['qtwebkit-qmldesigner']

NOTE: Runtime target 'qtquick1-dev' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['qtquick1-dev',
'qtwebkit', 'qtwebkit-qmldesigner']
...

it's caused by qtwebkit redefinition of PACKAGES variable:
# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc,
# because it conflicts with ${PN} from separate webkit-examples recipe
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins
${PN}-mkspecs "


Can you change qtwebkit_git.bb to use PACKAGES_remove and resend tested
patch?

Regards,

> ---
>  recipes-qt/qt5/qt5.inc | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
> index 4c58ad6..17d8fd7 100644
> --- a/recipes-qt/qt5/qt5.inc
> +++ b/recipes-qt/qt5/qt5.inc
> @@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
>  INSANE_SKIP_${PN}-examples-dbg += "libdir"
>  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 "
> +PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmldesigner ${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"
> @@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
>  RRECOMMENDS_${PN}-dev = " \
>      ${PN} \
>      ${PN}-mkspecs \
> +    ${PN}-qmldesigner \
>      "
>  
>  RRECOMMENDS_${PN}-dbg = " \
> @@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
>  "
>  
>  # extra packages
> +FILES_${PN}-qmldesigner += " \
> +    ${OE_QMAKE_PATH_QML}/*/designer \
> +    ${OE_QMAKE_PATH_QML}/*/*/designer \
> +"
> +
>  # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
>  FILES_${PN}-qmlplugins = " \
>      ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]