summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-27 15:21:02 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2017-01-10 09:38:08 +0000
commit29429ea658d8d2aa9bff2ccc63e614fed0ca760e (patch)
tree266119f39594ccc0c2d4e07966a97c40a953d824
parent8a63c0e1312731d8e63166a5bd6288bdd92f2006 (diff)
downloadmeta-boot2qt-29429ea658d8d2aa9bff2ccc63e614fed0ca760e.tar.gz
qt5: add qtnetworkauth and qtscxml modules
Change-Id: Iec92f6fe60fb1e2d744596414908697e3eab268f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb1
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bbappend30
-rw-r--r--recipes-qt/qt5/qtscxml_git.bbappend30
-rw-r--r--scripts/manifest.xml2
5 files changed, 64 insertions, 1 deletions
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 d5ba0c2..7dab944 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} += "\
41 nativesdk-qtdeclarative-tools \ 41 nativesdk-qtdeclarative-tools \
42 nativesdk-qtdeclarative-staticdev \ 42 nativesdk-qtdeclarative-staticdev \
43 nativesdk-qt3d-tools \ 43 nativesdk-qt3d-tools \
44 nativesdk-qtscxml-tools \
44 " 45 "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index c551cf0..2d9eeb6 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} += " \
48 qtimageformats \ 48 qtimageformats \
49 qtlocation \ 49 qtlocation \
50 qtmultimedia \ 50 qtmultimedia \
51 qtnetworkauth \
51 qtotaupdate \ 52 qtotaupdate \
52 qtquickcontrols \ 53 qtquickcontrols \
53 qtquickcontrols2 \ 54 qtquickcontrols2 \
55 qtscxml \
54 qtsensors \ 56 qtsensors \
55 qtserialbus \ 57 qtserialbus \
56 qtserialport \ 58 qtserialport \
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bbappend b/recipes-qt/qt5/qtnetworkauth_git.bbappend
new file mode 100644
index 0000000..a3fe64b
--- /dev/null
+++ b/recipes-qt/qt5/qtnetworkauth_git.bbappend
@@ -0,0 +1,30 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37"
diff --git a/recipes-qt/qt5/qtscxml_git.bbappend b/recipes-qt/qt5/qtscxml_git.bbappend
new file mode 100644
index 0000000..4f4512f
--- /dev/null
+++ b/recipes-qt/qt5/qtscxml_git.bbappend
@@ -0,0 +1,30 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4f13a83..2fcf47f 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -23,7 +23,7 @@
23 path="sources/meta-openembedded"/> 23 path="sources/meta-openembedded"/>
24 <project name="meta-qt5" 24 <project name="meta-qt5"
25 remote="qtyocto" 25 remote="qtyocto"
26 revision="c95e558867ac40ade140754b8a37a73531e6034b" 26 revision="88fa1db0a6fde5a557a8fe2a15698fcde84ff822"
27 path="sources/meta-qt5"/> 27 path="sources/meta-qt5"/>
28 <project name="meta-mingw" 28 <project name="meta-mingw"
29 remote="qtyocto" 29 remote="qtyocto"