From 29429ea658d8d2aa9bff2ccc63e614fed0ca760e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 27 Dec 2016 15:21:02 +0200 Subject: [PATCH] qt5: add qtnetworkauth and qtscxml modules Change-Id: Iec92f6fe60fb1e2d744596414908697e3eab268f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> --- ...egroup-b2qt-embedded-qt5-toolchain-host.bb | 1 + .../packagegroup-b2qt-qt5-modules.bb | 2 ++ recipes-qt/qt5/qtnetworkauth_git.bbappend | 30 +++++++++++++++++++ recipes-qt/qt5/qtscxml_git.bbappend | 30 +++++++++++++++++++ scripts/manifest.xml | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtnetworkauth_git.bbappend create mode 100644 recipes-qt/qt5/qtscxml_git.bbappend 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 index d5ba0c28..7dab944c 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -41,4 +41,5 @@ RDEPENDS_${PN} += "\ nativesdk-qtdeclarative-tools \ nativesdk-qtdeclarative-staticdev \ nativesdk-qt3d-tools \ + nativesdk-qtscxml-tools \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index c551cf0f..2d9eeb69 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -48,9 +48,11 @@ RDEPENDS_${PN} += " \ qtimageformats \ qtlocation \ qtmultimedia \ + qtnetworkauth \ qtotaupdate \ qtquickcontrols \ qtquickcontrols2 \ + qtscxml \ qtsensors \ qtserialbus \ qtserialport \ diff --git a/recipes-qt/qt5/qtnetworkauth_git.bbappend b/recipes-qt/qt5/qtnetworkauth_git.bbappend new file mode 100644 index 00000000..a3fe64b6 --- /dev/null +++ b/recipes-qt/qt5/qtnetworkauth_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37" diff --git a/recipes-qt/qt5/qtscxml_git.bbappend b/recipes-qt/qt5/qtscxml_git.bbappend new file mode 100644 index 00000000..4f4512fd --- /dev/null +++ b/recipes-qt/qt5/qtscxml_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4f13a83d..2fcf47f2 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -23,7 +23,7 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="c95e558867ac40ade140754b8a37a73531e6034b" + revision="88fa1db0a6fde5a557a8fe2a15698fcde84ff822" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" -- GitLab