From ae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 11:01:04 +0300 Subject: Build Qt5 and all addons Use meta-qt5 layer to build Qt5, commercial addons and b2qt addons. Create new image and toolchain recipes with Qt5 content, so that the existing image and toolchain remain as-is without Qt5. Currently support only for imx6 targets. Change-Id: I398750dd1a62c6ff8ea216cfe364da273d8e9a77 Reviewed-by: Andy Nichols --- ...ackagegroup-b2qt-embedded-qt5-toolchain-host.bb | 34 +++++++++++++ ...up-b2qt-embedded-qt5-addons-toolchain-target.bb | 36 ++++++++++++++ .../packagegroup-b2qt-embedded-qt5-addons.bb | 40 ++++++++++++++++ ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 55 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-qt5.bb | 47 ++++++++++++++++++ 5 files changed, 212 insertions(+) create mode 100644 recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb (limited to 'recipes-qt/packagegroups') diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb new file mode 100644 index 0000000..1979879 --- /dev/null +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -0,0 +1,34 @@ +############################################################################# +## +## 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 = "Host packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit nativesdk packagegroup + +RDEPENDS_${PN} += "\ + nativesdk-packagegroup-b2qt-embedded-toolchain-host \ + nativesdk-qttools \ + nativesdk-qtbase-tools \ + nativesdk-qtbase-tools-staticdev \ + " 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 new file mode 100644 index 0000000..66e7457 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb @@ -0,0 +1,36 @@ +############################################################################# +## +## 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 = "Qt5 addons toolchain packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization-dev \ + qtenterprisecontrols-dev \ + qtcharts-dev \ + qtvirtualkeyboard-dev \ + b2qt-utils-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb new file mode 100644 index 0000000..3ba3f83 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb @@ -0,0 +1,40 @@ +############################################################################# +## +## 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 = "Qt5 addons packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization \ + qtquickenterprisecontrols \ + qtquickenterprisecontrols-fonts \ + qtcharts \ + qtvirtualkeyboard \ + b2qt-appcontroller \ + b2qt-utils \ + b2qt-launcher \ + b2qt-demos \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb new file mode 100644 index 0000000..d740991 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## 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 = "Target packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + packagegroup-b2qt-embedded-toolchain-target \ + qt3d-dev \ + qtbase-dev \ + qtbase-staticdev \ + qtconnectivity-dev \ + qtdeclarative-dev \ + qtdeclarative-staticdev \ + qtgraphicaleffects-dev \ + qtimageformats-dev \ + qtlocation-dev \ + qtmultimedia-dev \ + qtsensors-dev \ + qtserialport-dev \ + qtsvg-dev \ + qtsystems-dev \ + qttools-dev \ + qttools-staticdev \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ + qtwebsockets-dev \ + qtwebchannel-dev \ + qtxmlpatterns-dev \ + qtquickcontrols-dev \ + qtwebengine-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb new file mode 100644 index 0000000..970da82 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## 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 = "Qt5 modules" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtbase \ + qtbase-fonts \ + qtconnectivity \ + qtdeclarative \ + qtdeclarative-tools \ + qtgraphicaleffects \ + qtimageformats \ + qtlocation \ + qtmultimedia \ + qtsensors \ + qtserialport \ + qtsvg \ + qtwebsockets \ + qtxmlpatterns \ + qtquickcontrols \ + qtwebengine \ + " -- cgit v1.2.3-54-g00ecf