From a272b577702dce1d27b8ee9d45581b8ca8ef31a4 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 2 Nov 2016 12:50:04 +0200 Subject: qt5: update submodules Change-Id: I34ed1989626992c79eb04afbe44042938b5d611f Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index d8caa8f..08b6081 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" +SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 95ffc05..aa89e73 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 = "87efd2423e11b2103c5e50528b6f704d3fc2c84a" +SRCREV = "0eac16fbda846c951f9b3887199e72b66f5aacd7" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index e07eb7c..322312e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" +SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 615cdc6..1e1dd84 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,5 +53,5 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" +SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 4af6581..3094d0d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "fff4477661ae240c43088fa6d9069ccf969dbee8" +SRCREV = "c5755267227a81e35052eb447895aa2f1428ebe1" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index e36ab3e..10309ad 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "3f813d1c8c24e5da67d3f096eb3f5c73e760e641" +SRCREV = "3abe52c28d9d960b284586e5b6f0277f91362ee9" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ed98dd3..4a71a0f 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 = "c954fe7f171c0602cdb555ef10618769991513b6" +SRCREV = "e4aef963cbd32274669af6b66158f6f0ca4ba3ed" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index aa8c29c..3e796ed 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "88969bdbd66b0829fe5e5b90eeb605c663d1b887" +SRCREV = "6f6e073815d5b05aba553b83809fb701541260c6" diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend index f06f890..2d7e0ee 100644 --- a/recipes-qt/qt5/qtserialbus_git.bbappend +++ b/recipes-qt/qt5/qtserialbus_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "f0482d704e3834f2199889f997b421c0171bd94f" +SRCREV = "768b2d463663104daae44f564f09c3a10e2e6ad6" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index ebbb4c4..9b17908 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "ae9472a39327ce5d5d6735308bd2aef272771391" +SRCREV = "01a560811df01514673315dc461ad7f51eff1dfa" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 1841c87..7661cbe 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "fcaa38c84dc92ec951c43e1759d7a46080755cbc" +SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 1841c87..7661cbe 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "fcaa38c84dc92ec951c43e1759d7a46080755cbc" +SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index ba2818c..8fc8eff 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "fe8ae4b78065916e1882aaedc5994d66a8456df4" +SRCREV_qtwebengine = "37c8cc637d8f2e06b715362d5b8fa491e1ce93ff" SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" -- cgit v1.2.3-54-g00ecf From 374b33f6affcd6f20dc33e7463598f9ff8360c20 Mon Sep 17 00:00:00 2001 From: Kwangsub Kim Date: Fri, 4 Nov 2016 14:44:25 +0900 Subject: otf-noto: update checksums Change-Id: If50d02ace86e10a01f0283a53cb1fafedf667905 Reviewed-by: Samuli Piippo --- recipes/fonts/otf-noto.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index 7caf8ec..e715f91 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -32,8 +32,8 @@ inherit allarch fontcache PV = "1.004" SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip" -SRC_URI[md5sum] = "3a2e70a4cd1f4ca4b546146b8556dffb" -SRC_URI[sha256sum] = "89646c86a48c1d5d25d435c31d673695bbd5751534004e9746f7d4aa71402a8f" +SRC_URI[md5sum] = "539a04d2a14a12096897f84ba046d110" +SRC_URI[sha256sum] = "c0a77b24ce1964c5d244be7576ada5899d681638e0abd0917e6a661df56e0232" S = "${WORKDIR}" -- cgit v1.2.3-54-g00ecf From 0f0cb68128ab80e920e072f1866d35c066456934 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 14 Nov 2016 14:52:10 +0200 Subject: qt5: update submodules Change-Id: Iad62f9e644bb9c8bda1f00b34ea3a916976bd870 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 08b6081..4c832e0 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" +SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 322312e..bcd3aa2 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" +SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 1e1dd84..4b0d206 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,5 +53,5 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" +SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index a3dc415..c1a9bbd 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "7b443cd0fdd1940a8bfaad73df5e309a52b7669f" +SRCREV = "d884d20c5530b67fbd2fba35cdb71a9f969196be" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 3094d0d..152892e 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "c5755267227a81e35052eb447895aa2f1428ebe1" +SRCREV = "2a992040e2ef3f9dab087be3bfac05e28596672b" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 10309ad..52c490e 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "3abe52c28d9d960b284586e5b6f0277f91362ee9" +SRCREV = "de5be121d84b062f1b72c91dddc877e5e88babc0" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index df982d8..d248cf0 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -30,4 +30,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "ecd018fe2ee4508e094f631d882ecc1360abec01" +SRCREV = "5a57beaaa5f637070ccbf30d79ad27861134c7a8" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 131ff1c..498aeb6 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "dee818e77a6cf9a6c164fbc7ee132fe875f7f998" +SRCREV = "0b9f41c28cece4fe51011083e646aba405ec3a65" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 9b17908..6f2c016 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "01a560811df01514673315dc461ad7f51eff1dfa" +SRCREV = "8575ed82ff0dd43aed8f5de67b4cfef06fec8c33" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 5867432..e19dfe7 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "2d29a774dd165ee2acd0b607b7e0d02a37c5fea5" +SRCREV = "31eb0d8c7d78fe60dbad94091a56e97b4fcaa52b" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 8fc8eff..aadbc09 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "37c8cc637d8f2e06b715362d5b8fa491e1ce93ff" +SRCREV_qtwebengine = "15ded5ca62f53a01f85a52326f0b335a8a012bbd" SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" -- cgit v1.2.3-54-g00ecf From a347e9fcbc3ca216884f3133267ea0ce4d4d1920 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Nov 2016 16:36:18 +0200 Subject: Use correct license header Change-Id: I46fbf67b54b193b3f033fc49836457d33eb3769c Reviewed-by: Teemu Holappa --- conf/distro/include/colibri-imx7.conf | 35 +++++++++++++++++++++-------------- conf/distro/include/tegra-t18x.conf | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 877177e..8b580d4 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf @@ -1,24 +1,31 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. +## This file is part of the Boot to Qt meta layer. ## -## $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_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$ ## -############################################################################# +############################################################################ include conf/distro/include/toradex.inc diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index 50ed829..f58474e 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf @@ -1,24 +1,31 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2016 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. +## This file is part of the Boot to Qt meta layer. ## -## $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_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$ ## -############################################################################# +############################################################################ include conf/distro/include/tegra.inc -- cgit v1.2.3-54-g00ecf From c00f8a27029ace42107eeeca97e010326208706b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 15 Nov 2016 13:11:11 +0200 Subject: update maintainer email info Change-Id: Ie0c2a12007fc5cb485d42b9797a576b8b03731ab Reviewed-by: Kimmo Ollila --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 946e238..22bbbe1 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -30,7 +30,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" BUILDCFG_VARS += "SDKMACHINE" -MAINTAINER = "B2Qt " +MAINTAINER = "B2Qt " SANITY_TESTED_DISTROS += " \ Ubuntu 11.04 \n \ -- cgit v1.2.3-54-g00ecf