3 files changed, 23 insertions, 2 deletions

diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 8d0efae557..5f34ad11d2 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -76,10 +76,11 @@ POKY_BASE_INSTALL = '\
     \
     ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
     ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
-
+    \
     ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
     \
     ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
+    ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \
     ${POKY_EXTRA_INSTALL} \
     '
 
diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb
new file mode 100644
index 0000000000..606ebab4e1
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-poky-qt.bb
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2010  Intel Corporation. All rights reserved
+#
+
+DESCRIPTION = "Qt Tasks for Poky"
+LICENSE = "MIT"
+PR = "r0"
+
+PACKAGES = "\
+    task-poky-qt-demos \
+    task-poky-qt-demos-dbg \
+    task-poky-qt-demos-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-qt-demos = "\
+    fotowall \
+    quicky \
+    "
diff --git a/meta/recipes-sato/images/poky-image-sdk.bb b/meta/recipes-sato/images/poky-image-sdk.bb
index 1df832a0b2..c3fbce76c3 100644
--- a/meta/recipes-sato/images/poky-image-sdk.bb
+++ b/meta/recipes-sato/images/poky-image-sdk.bb
@@ -2,6 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs"
 
 inherit poky-image