From b9437655abb2ad97469eaa60cf77b5cdea89eb44 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 22 Nov 2016 08:55:30 +0200 Subject: meta-qt5: update to latest revision Change-Id: If559f56a8f536d5d34511cca429305b501cf58b4 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/neptune-ui_git.bb | 1 + recipes-qt/automotive/qmllive-target_git.bb | 1 + recipes-qt/automotive/qtwebbrowser_git.bb | 1 + recipes-qt/b2qt-addons/b2qt-demos.bb | 6 ++++-- recipes-qt/b2qt-addons/b2qt-launcher.bb | 1 + recipes-qt/b2qt-addons/democompositor_git.bb | 1 + scripts/manifest.xml | 2 +- 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 66703c6..bb188f8 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -34,6 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c" inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc +QT_GIT = "git://github.com/qtproject" QT_MODULE = "qt-apps-neptune-ui" QT_MODULE_BRANCH = "master" diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb index 7819941..4bf7ef8 100644 --- a/recipes-qt/automotive/qmllive-target_git.bb +++ b/recipes-qt/automotive/qmllive-target_git.bb @@ -35,6 +35,7 @@ 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_MODULE_BRANCH = "master" diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb index b06446e..25e28df 100644 --- a/recipes-qt/automotive/qtwebbrowser_git.bb +++ b/recipes-qt/automotive/qtwebbrowser_git.bb @@ -34,6 +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_MODULE_BRANCH = "dev" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index eec5bc4..3fbc0a0 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -33,11 +33,13 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4 inherit qmake5 +QT_PROJECT_GIT = "git://github.com/qtproject" + SRC_URI = " \ - ${QT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ + ${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_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ + ${QT_PROJECT_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 \ " diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index e131b2a..c3f4061 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -34,6 +34,7 @@ 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" SRC_URI += " \ diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 8c85081..8834e19 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb @@ -34,6 +34,7 @@ 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" SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1938aee..1791bea 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -23,7 +23,7 @@ path="sources/meta-openembedded"/>