aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-06-30 14:16:44 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2021-09-09 18:47:43 +0300
commit403ab76764741183863f72723e1258919742a0bc (patch)
tree26409692eaeaa86dbc2a1df2f94adcd19c174f71 /coin
parent6ce601a4d55a5e61f97e34cda7cce860a61e6ffb (diff)
Add QtWebEngine
Build QtWebEngine using CMake. Include helper files (chromium-gn.inc and gn-utils.inc) from meta-browser. QtWebEngine build no longer requires additional support in the host system, instead the build time tools are run using QEMU. WebEngine requires python2, available from meta-python2 layer, and at least CMake 3.19. Only oe-core/hardknott provides recent enough CMake. CI builds of webengine are limited to hardknott for this reason. To use system ICU, QtWebEngine requires ICU 68 or up. This is also available starting from oe-core/hardnott. spellchecker feature doesn't work properly, since it requires a native util to be built. Task-number: QTBUG-93825 Change-Id: Id150275f5adfedd8f1acdc5f92c46a437da84f2e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/module_config.yaml13
-rw-r--r--coin/test-hardknott.inc3
2 files changed, 10 insertions, 6 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index bd49a9e..90161bd 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -112,12 +112,10 @@ instructions:
sudo mkdir -p /mnt/yocto-cache
sudo mount yocto-cache.intra.qt.io:/srv/yocto-cache /mnt/yocto-cache
- git clone git://git.yoctoproject.org/poky --reference /mnt/yocto-cache/mirror/poky.git
- (cd poky; git checkout ${YOCTO_BRANCH})
- git clone git://github.com/openembedded/meta-openembedded --reference /mnt/yocto-cache/mirror/meta-openembedded.git
- (cd meta-openembedded; git checkout ${YOCTO_BRANCH})
- git clone git://git.yoctoproject.org/meta-mingw --reference /mnt/yocto-cache/mirror/meta-mingw.git
- (cd meta-mingw; git checkout ${YOCTO_BRANCH})
+ git clone git://git.yoctoproject.org/poky --reference /mnt/yocto-cache/mirror/poky.git -b ${YOCTO_BRANCH}
+ git clone git://github.com/openembedded/meta-openembedded --reference /mnt/yocto-cache/mirror/meta-openembedded.git -b ${YOCTO_BRANCH}
+ git clone git://git.yoctoproject.org/meta-mingw --reference /mnt/yocto-cache/mirror/meta-mingw.git -b ${YOCTO_BRANCH}
+ git clone git://git.openembedded.org/meta-python2 --reference /mnt/yocto-cache/mirror/meta-python2.git -b ${YOCTO_BRANCH}
source ./poky/oe-init-build-env
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR DL_DIR"
@@ -126,7 +124,10 @@ instructions:
DISTRO_CODENAME=$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../poky/meta-*/conf/distro/poky.conf)
export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/${DISTRO_CODENAME}-meta-qt6
bitbake-layers add-layer ../meta-openembedded/meta-oe
+ bitbake-layers add-layer ../meta-openembedded/meta-python
+ bitbake-layers add-layer ../meta-openembedded/meta-multimedia
bitbake-layers add-layer ../meta-mingw
+ bitbake-layers add-layer ../meta-python2
bitbake-layers add-layer ${SOURCE_DIR}
if [ -n "${DISABLE_X11}" ] ; then
diff --git a/coin/test-hardknott.inc b/coin/test-hardknott.inc
new file mode 100644
index 0000000..8ff46b9
--- /dev/null
+++ b/coin/test-hardknott.inc
@@ -0,0 +1,3 @@
+DISTRO_FEATURES_append = " webengine"
+LICENSE_FLAGS_WHITELIST = "commercial"
+PACKAGECONFIG_append_pn-qtwebengine = " examples proprietary-codecs ffmpeg"