diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-10-07 08:05:32 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-10-08 09:49:41 +0300 |
| commit | e402fa37ceb528cca6ee6fe3c069d2e223df5968 (patch) | |
| tree | 39d3dd0e08c4a48c77ee8a836bbf9a9688123cfa | |
| parent | 43ae30d0852a30a80d2c2ac1a784441b356000ee (diff) | |
meta-qt6: update layer
- Update to latest content in Qt 6.2 branch
- Update boot2qt-startupscreen revision to build
with cmake 3.16
changelog:
02a69ca qt6: update submodules
b483016 qtbase: remove runtime dependency to libssl from native package
27a8c9c qtwebengine: fix build with glibc-2.34
0232e91 qtconnectivity: inherit pkgconfig
d524cae qtwayland: inherit pkgconfig
9a736ed qt3d: disable system assimp
02d5a6b qtbase: fix build with glibc-2.34
49d6c23 qtserialport: inherit pkgconfig
9470ebe qtsensors: inherit pkgconfig
85d2f59 qtmultimedia: inherit pkgconfig
879b08e qtbase: inherit pkgconfig
b74cb78 layer.conf: LAYERSERIES_COMPAT: Add honister and drop zeus
6d74a73 Convert to new override syntax
a1b2b38 qtwebengine: inherit pkgconfig
9d68253 qtwebengine: enable webrtc-pipewire only when multimedia-layer is included
Task-number: QTBUG-97015
Change-Id: I0a6104b657f9e054f4b101788518c47293d69a00
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb | 4 | ||||
| -rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 3 insertions, 3 deletions
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 8cc7d286..b4bd9595 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -56,4 +56,4 @@ do_install_append() { SYSTEMD_SERVICE_${PN} = "startupscreen.service" -SRCREV = "5df03932a3046b23e26007f439222525fa221c3f" +SRCREV = "e5dc5380f41c281ac751a02dccd24cc445721277" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 455ab2ee..7051b86e 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -38,7 +38,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> <project name="meta-qt6" remote="qt" - revision="caaf2ea69721139fde49f221232403851cf6e03c" + revision="02a69cada40198db6dc7b3a5acf65f9750b0dc99" upstream="6.2" path="sources/meta-qt6"/> |