5 files changed, 122 insertions, 3 deletions

diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
new file mode 100644
index 0000000..6aafc77
--- /dev/null
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "B2Qt Automotive Qt5 image"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+PR = "r0"
+
+IMAGE_FEATURES += "\
+        package-management \
+        ssh-server-dropbear \
+        tools-debug \
+        debug-tweaks \
+        hwcodecs \
+        "
+
+inherit core-image
+inherit bootfs-image
+
+MACHINE_EXTRA_INSTALL_QT ?= ""
+
+IMAGE_INSTALL += "\
+    ${MACHINE_EXTRA_INSTALL_QT} \
+    packagegroup-b2qt-embedded-base \
+    packagegroup-b2qt-embedded-tools \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    packagegroup-b2qt-qt5-modules \
+    packagegroup-b2qt-automotive-addons \
+    "
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 924ba61..8c986ac 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -44,6 +44,6 @@ IMAGE_INSTALL += "\
     packagegroup-b2qt-embedded-tools \
     ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
-    packagegroup-b2qt-embedded-qt5 \
-    packagegroup-b2qt-embedded-qt5-addons \
+    packagegroup-b2qt-qt5-modules \
+    packagegroup-b2qt-embedded-addons \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
new file mode 100644
index 0000000..a318d0e
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Automotive specific Qt packages"
+LICENSE = "QtEnterprise"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    b2qt-appcontroller \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
new file mode 100644
index 0000000..006702a
--- /dev/null
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -0,0 +1,35 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Device Creation specific Qt packages"
+LICENSE = "QtEnterprise"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    b2qt-appcontroller \
+    b2qt-utils \
+    b2qt-launcher \
+    b2qt-demos \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 861f61a..cc4784a 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -32,13 +32,16 @@ RDEPENDS_${PN} += " \
     qtbase \
     qtbase-fonts \
     qtcanvas3d \
+    qtcharts \
     qtconnectivity \
+    qtdatavisualization \
     qtdeclarative \
     qtdeclarative-tools \
     qtgraphicaleffects \
     qtimageformats \
     qtlocation \
     qtmultimedia \
+    qtquickcontrols \
     qtsensors \
     qtserialport \
     qtsvg \
@@ -48,5 +51,5 @@ RDEPENDS_${PN} += " \
     qtwebsockets \
     qtwebchannel \
     qtxmlpatterns \
-    qtquickcontrols \
+    qtvirtualkeyboard \
     "