diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-15 09:47:50 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-16 11:34:36 +0300 |
| commit | a90a34313d9e9b40d635377a76a29554f1390a41 (patch) | |
| tree | 62cc0a8c1a90f42caec9fb193635a2b45062145f | |
| parent | 834b0ea2172ccf3167a5639d04378bc583bcfb46 (diff) | |
meta-qt5: update layer
Update to latest content in Qt 5.15 branch.
Adapt to changes from upstream/master:
- compatibility to dunfell layer
- add bbmask for creator recipe as required is bbclass is not present
in yocto zeus branch
changelog:
* 34f4b7b0 - qt5: update submodules
* 7de0cbd5 - Merge remote-tracking branch 'qt/upstream/master' into 5.15
* 374abadf - Merge remote-tracking branch 'qt/5.14' into 5.15
* 3cba8063 - meta-qt5: Support latest Yocto project
* 634da009 - QTWebkit: Support RISC-V ISA on QTwebkit
* dd2fd47d - QTWebKit: Fix build error on QT-5.15 branch
* 84278d09 - QTWebkit: Move webkit sha1 to dev branch HEAD on QT-5.15
Task-number: QTBUG-80823
Change-Id: I2203e9a502d8397a95833f1c85e9a6c14c467c2d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/conf/layer.conf | 4 | ||||
| -rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index 80a6d3fd..ac2428d0 100644 --- a/meta-boot2qt-distro/conf/layer.conf +++ b/meta-boot2qt-distro/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -40,6 +40,7 @@ BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt-distro = "20" LAYERSERIES_COMPAT_b2qt-distro = "zeus" +LAYERSERIES_COMPAT_qt5-layer_append = " zeus" # recipe appends for machine specific BSP layers BBFILES_DYNAMIC += " \ @@ -59,4 +60,5 @@ BBFILES_DYNAMIC += " \ BBMASK += "\ meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend \ + meta-qt5/recipes-qt/qt5/qt5-creator_git.bb \ " diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6966c69c..80d4802c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -34,7 +34,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> <project name="meta-qt5" remote="qt" - revision="b47dc504f384f1655a5c9cecb9d6ba24fcb1b10b" + revision="34f4b7b004eb6fa46282fff5d8c8026caf64740b" path="sources/meta-qt5"/> <!-- NXP --> |