diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-30 15:55:24 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-02 10:02:07 +0000 |
commit | a0549dd5c5603b06dfb1ab6843e740a5981f120b (patch) | |
tree | 92dda6e18556230a2e91d84b0d7d7237c5752169 /recipes-qt/packagegroups | |
parent | 0620623f153cdbccf46840c79eade69a1848b296 (diff) | |
download | meta-boot2qt-a0549dd5c5603b06dfb1ab6843e740a5981f120b.tar.gz |
qt5: add qt addons dev packages to the toolchain
packagegroup-b2qt-embedded-qt5-addons-toolchain-target was never
included in the toolchain.
Change-Id: I18b08c1ba1a1a663488fd2cde960d35c43dbb208
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'recipes-qt/packagegroups')
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb | 37 | ||||
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 8 |
2 files changed, 7 insertions, 38 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb deleted file mode 100644 index f009340..0000000 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb +++ /dev/null | |||
@@ -1,37 +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 | |||
23 | DESCRIPTION = "Qt5 addons toolchain packages" | ||
24 | LICENSE = "QtEnterprise" | ||
25 | |||
26 | inherit packagegroup | ||
27 | |||
28 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | ||
29 | |||
30 | RDEPENDS_${PN} += " \ | ||
31 | qtdatavisualization-dev \ | ||
32 | qtenterprisecontrols-dev \ | ||
33 | qtcharts-dev \ | ||
34 | qtvirtualkeyboard-dev \ | ||
35 | qtquickcompiler-dev \ | ||
36 | b2qt-utils-dev \ | ||
37 | " | ||
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index ccc78a4..06c1c79 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
@@ -33,6 +33,7 @@ MACHINE_EXTRA_INSTALL_QT_SDK ?= "" | |||
33 | RDEPENDS_${PN} += " \ | 33 | RDEPENDS_${PN} += " \ |
34 | ${MACHINE_EXTRA_INSTALL_QT_SDK} \ | 34 | ${MACHINE_EXTRA_INSTALL_QT_SDK} \ |
35 | packagegroup-b2qt-embedded-toolchain-target \ | 35 | packagegroup-b2qt-embedded-toolchain-target \ |
36 | \ | ||
36 | qt3d-dev \ | 37 | qt3d-dev \ |
37 | qtbase-dev \ | 38 | qtbase-dev \ |
38 | qtbase-staticdev \ | 39 | qtbase-staticdev \ |
@@ -44,6 +45,7 @@ RDEPENDS_${PN} += " \ | |||
44 | qtimageformats-dev \ | 45 | qtimageformats-dev \ |
45 | qtlocation-dev \ | 46 | qtlocation-dev \ |
46 | qtmultimedia-dev \ | 47 | qtmultimedia-dev \ |
48 | qtquickcontrols-dev \ | ||
47 | qtsensors-dev \ | 49 | qtsensors-dev \ |
48 | qtserialport-dev \ | 50 | qtserialport-dev \ |
49 | qtsvg-dev \ | 51 | qtsvg-dev \ |
@@ -54,5 +56,9 @@ RDEPENDS_${PN} += " \ | |||
54 | qtwebsockets-dev \ | 56 | qtwebsockets-dev \ |
55 | qtwebchannel-dev \ | 57 | qtwebchannel-dev \ |
56 | qtxmlpatterns-dev \ | 58 | qtxmlpatterns-dev \ |
57 | qtquickcontrols-dev \ | 59 | \ |
60 | b2qt-utils-dev \ | ||
61 | qtcharts-dev \ | ||
62 | qtdatavisualization-dev \ | ||
63 | qtvirtualkeyboard-dev \ | ||
58 | " | 64 | " |