Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:
  poky, meta-mingw: update to latest revision in morty branch
  qtdeviceutilities: update to latest version
  Add product name and Qt version to image conf
  Revert "Add appman versions of Kit and Qt to creator"

Change-Id: I3c0e48b7c9202a7b0081f3c56966af3283cf2650

1 files changed, 6 insertions, 2 deletions

diff --git a/meta-boot2qt/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass
index 228b1e2..22c6ef7 100644
--- a/meta-boot2qt/classes/deploy-conf.bbclass
+++ b/meta-boot2qt/classes/deploy-conf.bbclass
@@ -29,15 +29,19 @@
 
 inherit image_types
 
+IMAGE_DEPENDS_conf = "qtbase-native"
+
 DEPLOY_CONF_NAME ?= "${MACHINE}"
 DEPLOY_CONF_TYPE ?= "Boot2Qt"
 
 IMAGE_CMD_conf() {
+    QT_VERSION=$(qmake -query QT_VERSION)
     cat > ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.conf <<EOF
-[${DEPLOY_CONF_TYPE} | ${DEPLOY_CONF_NAME}]
+[${DEPLOY_CONF_NAME}]
 platform=${MACHINE}
+product=${DEPLOY_CONF_TYPE}
+qt=Qt $QT_VERSION
 os=linux
-board=
 imagefile=${IMAGE_LINK_NAME}.img
 asroot=true
 EOF