summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-01-13 11:35:15 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-01-13 10:59:58 +0000
commitcbfc3e2d5e6d16aab77b3df5aa924b72e2f33ef0 (patch)
treebdd49730f52376c9a73a50816aaf7da36c9d6eff
parent89c258704ea0e668e6dbbbfd19f1cc35c6c74fc5 (diff)
downloadmeta-boot2qt-cbfc3e2d5e6d16aab77b3df5aa924b72e2f33ef0.tar.gz
Include b2qt-utils in automotive image
b2qt-utils was left out of automotive image, although it was in the SDK. Remove unused packagegroup recipe, which was split in to two separate recipes earlier. Change-Id: I15f5f2453a88efe120c879bf340b277aebd0a6db Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb1
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb38
2 files changed, 1 insertions, 38 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 839266f..c1bdd89 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -29,6 +29,7 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
29 29
30RDEPENDS_${PN} += " \ 30RDEPENDS_${PN} += " \
31 b2qt-appcontroller \ 31 b2qt-appcontroller \
32 b2qt-utils \
32 qtivi \ 33 qtivi \
33 neptune-ui \ 34 neptune-ui \
34 neptune-ui-apps \ 35 neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb
deleted file mode 100644
index 76c4430..0000000
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb
+++ /dev/null
@@ -1,38 +0,0 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23DESCRIPTION = "Qt5 addons packages"
24LICENSE = "QtEnterprise"
25
26inherit packagegroup
27
28PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
29
30RDEPENDS_${PN} += " \
31 qtdatavisualization \
32 qtcharts \
33 qtvirtualkeyboard \
34 b2qt-appcontroller \
35 b2qt-utils \
36 b2qt-launcher \
37 b2qt-demos \
38 "