From 1941aac5043a86fe6b976c3e1b5181f8d917c0c8 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 27 Feb 2018 15:16:48 +0200 Subject: meta-qt5: update meta layer - Update SRC_URI for Qt modules from github to code.qt.io - Update QT submodules to 5.11.0 Beta1 Task-number: QTBUG-66307 Change-Id: Ia5670787568e7f1e247b939c8c3c992702db8217 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/multiscreen-demo_git.bb | 4 ++-- recipes-qt/automotive/neptune-ui_git.bb | 5 ++--- recipes-qt/automotive/qmllive-target_git.bb | 6 +++--- recipes-qt/automotive/qtwebbrowser_git.bb | 5 ++--- recipes-qt/b2qt-addons/b2qt-demos.bb | 14 +++++++------- recipes-qt/b2qt-addons/b2qt-launcher.bb | 4 ++-- recipes-qt/b2qt-addons/democompositor_git.bb | 6 +++--- recipes-qt/b2qt-addons/qdbd.bb | 8 ++++---- recipes-qt/qt5/qtotaupdate.bb | 1 - scripts/manifest.xml | 2 +- 10 files changed, 26 insertions(+), 29 deletions(-) diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 0c9a2bb..6b4e24f 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://code.qt.io/qt-apps" +QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "master" SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index c1d2e31..37a0cba 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,8 +37,7 @@ LIC_FILES_CHKSUM = "\ inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-neptune-ui" +QT_GIT_PROJECT = "qt-apps" SRC_URI += " \ file://neptune.service \ diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb index 4bf7ef8..54f1188 100644 --- a/recipes-qt/automotive/qmllive-target_git.bb +++ b/recipes-qt/automotive/qmllive-target_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -35,8 +35,8 @@ LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qmllive" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "qmllive" QT_MODULE_BRANCH = "master" SRC_URI += " \ diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb index 25e28df..9cc0d37 100644 --- a/recipes-qt/automotive/qtwebbrowser_git.bb +++ b/recipes-qt/automotive/qtwebbrowser_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6" inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qtwebbrowser" +QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "dev" SRCREV = "023733af5523a5ad84359926224fa106001215f4" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 1c46277..3726482 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -33,18 +33,18 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4 inherit qmake5 -QT_PROJECT_GIT = "git://github.com/qtproject" +QT_GIT_PROJECT="" SRC_URI = " \ - ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ - ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ - ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ - ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ + ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \ + ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ + ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ + ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " -PV = "5.10.0+git${SRCPV}" +PV = "5.11.0+git${SRCPV}" BRANCH = "5.10" BROWSER_BRANCH = "dev" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index b1a669c..225079d 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-boot2qt-launcher" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "boot2qt-launcher" SRC_URI += " \ file://b2qt-startup.sh \ diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 8834e19..3d9a196 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginli inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-boot2qt-demos" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "boot2qt-demos" SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb index e6c4509..7e56592 100644 --- a/recipes-qt/b2qt-addons/qdbd.bb +++ b/recipes-qt/b2qt-addons/qdbd.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -36,9 +36,9 @@ inherit distro_features_check inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qdb" -QT_MODULE_BRANCH = "5.8" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "qdb" +QT_MODULE_BRANCH = "5.9" SRC_URI += "file://b2qt-gadget-network.sh \ file://defaults \ diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb index ee7623c..502c48c 100644 --- a/recipes-qt/qt5/qtotaupdate.bb +++ b/recipes-qt/qt5/qtotaupdate.bb @@ -34,7 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qt" QT_MODULE_BRANCH = "master" SRCREV = "9a7eef1fec80e732451d501a658df9f8058a404d" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index f7315b5..135fdf9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/>