qt4e-demo-image: Switch to using task-qt4e.bb

In task-qt4e.bb put the xmlpatterns bits in RRECOMMENDS for QT 4.6.x

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/images/qt4e-base-image.bb b/recipes/images/qt4e-base-image.bb
index 4aa24da..84c12b3 100644 (file)
--- a/recipes/images/qt4e-base-image.bb
+++ b/recipes/images/qt4e-base-image.bb
@@ -2,42 +2,12 @@ require micro-base-image.bb
 
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
-RDEPENDS_append += " \
-        qt4-embedded \
-       "
+DEPENDS += "task-qt4e"
 
-QTE_INSTALL = " \
-       libqt-embedded3support4 \
-       libqt-embeddedclucene4 \
-       libqt-embeddedcore4 \
-       libqt-embeddeddbus4 \
-       libqt-embeddedgui4 \
-       libqt-embeddedhelp4 \
-       libqt-embeddedmultimedia4 \
-       libqt-embeddednetwork4 \
-       libqt-embeddedscript4 \
-       libqt-embeddedscripttools4 \
-       libqt-embeddedsql4 \
-       libqt-embeddedsvg4 \
-       libqt-embeddedtest4 \
-       libqt-embeddedwebkit4 \
-       libqt-embeddedxml4 \
-       libqt-embeddedxmlpatterns4 \
-       qt4-embedded-fonts-ttf-dejavu \
-       qt4-embedded-fonts-ttf-vera \
-       qt4-embedded-plugin-iconengine-svgicon \
-       qt4-embedded-plugin-imageformat-gif \
-       qt4-embedded-plugin-imageformat-ico \
-       qt4-embedded-plugin-imageformat-jpeg \
-       qt4-embedded-plugin-imageformat-mng \
-       qt4-embedded-plugin-imageformat-svg \
-       qt4-embedded-plugin-imageformat-tiff \
-       qt4-embedded-plugin-mousedriver-tslib \
-       qt4-embedded-plugin-phonon-backend-gstreamer \
-       qt4-embedded-plugin-script-dbus \
-       qt4-embedded-plugin-sqldriver-sqlite2 \
-       qt4-embedded-plugin-sqldriver-sqlite \
-"
+RDEPENDS_${PN} += " \
+       task-qt4e-base \
+       task-qt4e-qwt \
+       "
 
 IMAGE_INSTALL += "\
        initscripts \
@@ -45,7 +15,7 @@ IMAGE_INSTALL += "\
        gdbserver \
        strace \
        module-init-tools \
-       ${QTE_INSTALL} \
+       task-qt4e-base \
+       task-qt4e-qwt \
        ${TOUCH} \
-       qwt-e \
 "

diff --git a/recipes/tasks/task-qt4e.bb b/recipes/tasks/task-qt4e.bb
new file mode 100644 (file)
index 0000000..0576723
--- /dev/null
+++ b/recipes/tasks/task-qt4e.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "QT4 Embedded base Image Feed"
+PR = "r0"
+LICENSE = "MIT"
+
+inherit task
+
+PACKAGES += " \
+       ${PN}-base \
+       ${PN}-qwt \
+"
+
+RDEPENDS_${PN}-base = " \
+       qt4-embedded \
+       libqt-embedded3support4 \
+       libqt-embeddedclucene4 \
+       libqt-embeddedcore4 \
+       libqt-embeddeddbus4 \
+       libqt-embeddedgui4 \
+       libqt-embeddedhelp4 \
+       libqt-embeddedmultimedia4 \
+       libqt-embeddednetwork4 \
+       libqt-embeddedscript4 \
+       libqt-embeddedscripttools4 \
+       libqt-embeddedsql4 \
+       libqt-embeddedsvg4 \
+       libqt-embeddedtest4 \
+       libqt-embeddedwebkit4 \
+       libqt-embeddedxml4 \
+       qt4-embedded-fonts-ttf-dejavu \
+       qt4-embedded-fonts-ttf-vera \
+       qt4-embedded-plugin-iconengine-svgicon \
+       qt4-embedded-plugin-imageformat-gif \
+       qt4-embedded-plugin-imageformat-ico \
+       qt4-embedded-plugin-imageformat-jpeg \
+       qt4-embedded-plugin-imageformat-mng \
+       qt4-embedded-plugin-imageformat-svg \
+       qt4-embedded-plugin-imageformat-tiff \
+       qt4-embedded-plugin-mousedriver-tslib \
+       qt4-embedded-plugin-phonon-backend-gstreamer \
+       qt4-embedded-plugin-script-dbus \
+       qt4-embedded-plugin-sqldriver-sqlite2 \
+       qt4-embedded-plugin-sqldriver-sqlite \
+"
+
+RRECOMMENDS_${PN}-base = " \
+       libqt-embeddedxmlpatterns4 \
+"
+
+RDEPENDS_${PN}-qwt = "\
+       qwt-e \
+"