* Update packagegroup so it applies to Qt 5 users along with Qt 4 users. * To reflect this change also rename recipe top reflect that its a generic qt packagegroup.
Signed-off-by: Franklin S. Cooper Jr <[email protected]> --- .../packagegroups/packagegroup-arago-tisdk-qt.bb | 27 ++++++++++++++++++++ .../packagegroups/packagegroup-arago-tisdk-qte.bb | 19 -------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb new file mode 100644 index 0000000..c981f9e --- /dev/null +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Task to add Qt embedded related packages" +LICENSE = "MIT" +PR = "r0" + +inherit packagegroup + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +QT4_DEMOS = "\ + qt4-embedded-examples \ + qt4-embedded-demos \ + ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \ +" + +QT5_DEMOS = "\ + qtwebkit-examples-examples \ +" + +QT_DEMOS = "\ + ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}', '${QT4_DEMOS}', d)} \ + qt-tstat \ +" + +RDEPENDS_${PN} = "\ + ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5', 'packagegroup-arago-qte', d)} \ + ${QT_DEMOS} \ +" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb deleted file mode 100644 index 10187a6..0000000 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Task to add Qt embedded related packages" -LICENSE = "MIT" -PR = "r4" - -inherit packagegroup - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -QT_DEMOS = "\ - qt4-embedded-examples \ - qt4-embedded-demos \ - qt-tstat \ - ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \ -" - -RDEPENDS_${PN} = "\ - packagegroup-arago-qte \ - ${QT_DEMOS} \ -" -- 1.7.0.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
