diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-08-05 15:06:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-10-01 10:57:34 +0300 |
| commit | 3172c0053576a2142f42b70ac1c8bd8f5077d7e0 (patch) | |
| tree | ef0d1cc4b2439868036acbb0a675773ebaf2c4a6 /scripts | |
| parent | f05aa669da69406c6ecc1195ffd24e07aff0ea67 (diff) | |
Add webengine
Update meta-qt6 layer which includes new recipe for QtWebEngine.
It's included in the image when webengine DISTRO_FEATURE is available.
Remove from machines without gpu, since it currently won't build without
opengl enabled in qtbase.
Enable gold linker, it has better performance and avoids errors that can
occur with bfd when linking webengine..
Chromium depends on python2 for the build, add the new meta layer to
manifest and the default bblayer.confs.
Task-number: QTBUG-93825
Change-Id: I86cee372188a97dc2bf7b65d337425788725257b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 84eeee07b2bb88179e38dbb5aa1f982fcbbad278)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 0b606683..cc17d624 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,6 +24,11 @@ revision="8a80e07d3a24bfd881f5b631f8c0f14665fb63fd" upstream="master" path="sources/meta-openembedded"/> + <project name="meta-python2" + remote="oe" + revision="f522fa70f93a9339f3b9991082af69a09fde675a" + upsream="master" + path="sources/meta-python2"/> <!-- Qt --> <remote name="qt" @@ -33,7 +38,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> <project name="meta-qt6" remote="qt" - revision="c592e2d63ea574c25eef1434ebdb44625081f3b3" + revision="197eef0cee78ad2d7a1b6a74a3ab147df280a175" upstream="dev" path="sources/meta-qt6"/> |