summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-22 08:55:30 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-23 08:08:14 +0000
commitb9437655abb2ad97469eaa60cf77b5cdea89eb44 (patch)
tree7c21734e17dbd305cb29ecb1d74c0f00857ad0a0
parent1a9ad4899efb2f3054ec0d676e41a85e01d8f806 (diff)
downloadmeta-boot2qt-b9437655abb2ad97469eaa60cf77b5cdea89eb44.tar.gz
meta-qt5: update to latest revision
Change-Id: If559f56a8f536d5d34511cca429305b501cf58b4 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/automotive/neptune-ui_git.bb1
-rw-r--r--recipes-qt/automotive/qmllive-target_git.bb1
-rw-r--r--recipes-qt/automotive/qtwebbrowser_git.bb1
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb6
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb1
-rw-r--r--recipes-qt/b2qt-addons/democompositor_git.bb1
-rw-r--r--scripts/manifest.xml2
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"
34inherit qt5-module systemd 34inherit qt5-module systemd
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject"
37QT_MODULE = "qt-apps-neptune-ui" 38QT_MODULE = "qt-apps-neptune-ui"
38QT_MODULE_BRANCH = "master" 39QT_MODULE_BRANCH = "master"
39 40
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
35inherit qmake5 35inherit qmake5
36require recipes-qt/qt5/qt5-git.inc 36require recipes-qt/qt5/qt5-git.inc
37 37
38QT_GIT = "git://github.com/qtproject"
38QT_MODULE = "qt-apps-qmllive" 39QT_MODULE = "qt-apps-qmllive"
39QT_MODULE_BRANCH = "master" 40QT_MODULE_BRANCH = "master"
40 41
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"
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject"
37QT_MODULE = "qt-apps-qtwebbrowser" 38QT_MODULE = "qt-apps-qtwebbrowser"
38QT_MODULE_BRANCH = "dev" 39QT_MODULE_BRANCH = "dev"
39 40
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
33 33
34inherit qmake5 34inherit qmake5
35 35
36QT_PROJECT_GIT = "git://github.com/qtproject"
37
36SRC_URI = " \ 38SRC_URI = " \
37 ${QT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ 39 ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \
38 ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ 40 ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
39 ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ 41 ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
40 ${QT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ 42 ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
41 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ 43 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
42 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ 44 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
43 " 45 "
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"
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject"
37QT_MODULE = "qt-apps-boot2qt-launcher" 38QT_MODULE = "qt-apps-boot2qt-launcher"
38 39
39SRC_URI += " \ 40SRC_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
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37QT_GIT = "git://github.com/qtproject"
37QT_MODULE = "qt-apps-boot2qt-demos" 38QT_MODULE = "qt-apps-boot2qt-demos"
38 39
39SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" 40SRCREV = "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 @@
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="8c7e11523eb0bc1044e79593a1ffa823867ff567" 26 revision="4e113c7b8e0a7512d2f0ad306decc8b4885ef807"
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"