diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-11-25 15:17:46 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-11-26 09:07:24 +0200 |
| commit | e61e2352936274ec51d6aefe2d76f2ec5d13ced5 (patch) | |
| tree | f3a2477899f07ef70bec32e62db8123f0d32036e | |
| parent | aeca8ca2b8502a60716ebe057201be0a5b73d737 (diff) | |
meta-qt6: update layer
- Update to Qt 6.0.0 RC
- Adjust addon module branches following branch config changes
in meta-qt6/recipes-qt/qt6/qt6-git.inc
changelog:
b1adc3f Update readme
03489c6 qt6: update submodules
4ee65d5 qt6: update submodules
4246a8a qtbase: update opengl PACKAGECONFIGs
Task-number: QTBUG-86349
Change-Id: I1f445524eb228e5a6d8564a556013f61ae88673c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb | 1 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb | 1 | ||||
| -rw-r--r-- | scripts/manifest.xml | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb index f8f2e1fa..d02339e9 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb @@ -35,6 +35,7 @@ inherit qt6-qmake require recipes-qt/qt6/qt6-git.inc QT_GIT_PROJECT = "qt-apps" +QT_MODULE_BRANCH = "5.15" SRCREV = "474fa4b7aee62e704158d213d9e67eba74c69401" diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb index 676917d7..4ca1bdba 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb @@ -38,6 +38,7 @@ QT_GIT = "git://codereview.qt-project.org" QT_GIT_PROTOCOL = "http" QT_GIT_PROJECT = "qt-apps" QT_MODULE = "boot2qt-demos" +QT_MODULE_BRANCH = "dev" SRC_URI += "\ file://startupscreen.service \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 7d68b845..4710ade8 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -30,7 +30,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> <project name="meta-qt6" remote="qt" - revision="7631ce8e651d66710bb7a4b6e195c3af0e148573" + revision="b1adc3fa3a86a1aeca27727fa8caef8b9c69637e" path="sources/meta-qt6"/> <!-- NXP --> |