From 2cafe6bd533b2b645c0695c9fae5e294f76730da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 6 Jun 2016 10:25:33 +0300 Subject: qt5: update submodules qtdeclarative-render2d is now in meta-qt5, so use bbappend instead. Change-Id: I81dee336084fc1050b21c288284db1bb1654b61a Reviewed-by: Teemu Holappa --- .../qt5-addons/qtdeclarative-render2d_git.bb | 40 ---------------------- recipes-qt/qt5-addons/qtquickcompiler_git.bb | 5 ++- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdatavis3d_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bbappend | 30 ++++++++++++++++ recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- 11 files changed, 40 insertions(+), 51 deletions(-) delete mode 100644 recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb create mode 100644 recipes-qt/qt5/qtdeclarative-render2d_git.bbappend (limited to 'recipes-qt') diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb deleted file mode 100644 index 42c8e1d..0000000 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -DESCRIPTION = "Qt Quick 2D Rendender" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17" - -inherit qt5-module -require recipes-qt/qt5/qt5-git.inc - -QT_MODULE_BRANCH = "dev" -SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62" - -DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb index c15ebd4..fc08950 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb @@ -34,11 +34,10 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a154 inherit qt5-module SRC_URI = " \ - git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15" -BRANCH = "5.6" +SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index d1fa4f8..41e5765 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -33,4 +33,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "fb07d54eb4ea70faee73fb0a6fef2c672d5ba478" +SRCREV = "a398469e66e3a953097857c60655c41bf291a06b" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index fc11a53..b208484 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "241ef04afe45967a736802d4f4ce89d79e4b6d1b" +SRCREV = "23a207fb56bf21aeb598ddd914159333f28f8a00" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend index 164a5de..f468494 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bbappend +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "02af08a705ada1ca2dac839a026a816a8e70def5" +SRCREV = "57832c490a6f34f6ede7caa864dde20abda94358" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend new file mode 100644 index 0000000..b6b620b --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-render2d_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 = "13a6c51f26128015c0a3c335bdae676b46df6ed6" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 16561f8..8f117a1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e" +SRCREV = "48086a7573268774fab346d6fde0c9137ba1bf4e" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index 40448f5..2886e20 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "1736925ad72808ecf461a803197dd7ad0ce2994b" +SRCREV = "6b0fc95d094258d968b57f48c03f10be2fe8ac26" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index b735ff0..730635a 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "1d0a02f8a227286dbc383f890a1fd61e9139c223" +SRCREV = "5716e18a8f63593e8e64fce0b44d714fddfe7298" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 40606c2..3ba915d 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "2a593a98fd2d58f942e9171f3d5b0c851fefe4aa" +SRCREV = "0918ffa9f32a6ff59f101ffd80c2325f2fbd0e6d" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 26d889d..e525d81 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "4fda82b66e17cc03e6b08f1afd135069cfef09b7" +SRCREV = "18d8ca185819d6d81a9f21858ff2d60bf6fd05f8" -- cgit v1.2.3-54-g00ecf