diff --git a/README.md b/README.md index d10fa4a..440251c 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,16 @@ The branching of meta-qt6 layer follows Qt branching scheme, that is `dev` for the development branch, and `6.x` for each minor release. Following table shows the Yocto branches which are used to test each -Qt version. +Qt version (x) and any additional Yocto releases that are stated in +the LAYERSERIES_COMPAT (c). -| Yocto \ Qt | dev | 6.2 | 6.1 | 6.0 | -| ---------- |:---:|:---:|:---:|:---:| -| master | x | | | | -| hardknott | | x | x | x | -| gatesgarth | | x | x | x | -| dunfell | | x | x | x | +| Yocto \ Qt | 6.2 | 6.1 | 6.0 | +| ---------- |:---:|:---:|:---:| +| master | x | | | +| honister | c | | | +| hardknott | x | x | x | +| gatesgarth | x | x | x | +| dunfell | x | x | x | QtWebEngine ----------- diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 0ef0626..8572fa3 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,7 +17,7 @@ machine_type: # # [target1] [target2] [target3] [target4] # [machine] qemuarm64 qemux86 qemuarm qemux86-64 -# [yocto] hardknott dunfell gatesgarth dunfell +# [yocto] master gatesgarth hardknott dunfell # [X11] no no yes yes # [mingw] no yes no no # @@ -30,7 +30,7 @@ target1: &target1 variableValue: qemuarm64 - type: EnvironmentVariable variableName: YOCTO_BRANCH - variableValue: hardknott + variableValue: master - type: EnvironmentVariable variableName: DISABLE_X11 variableValue: true @@ -46,7 +46,7 @@ target2: &target2 variableValue: qemux86 - type: EnvironmentVariable variableName: YOCTO_BRANCH - variableValue: dunfell + variableValue: gatesgarth - type: EnvironmentVariable variableName: DISABLE_X11 variableValue: true @@ -65,7 +65,7 @@ target3: &target3 variableValue: qemuarm - type: EnvironmentVariable variableName: YOCTO_BRANCH - variableValue: gatesgarth + variableValue: hardknott enable_if: condition: property property: target.arch diff --git a/coin/test-configs.inc b/coin/test-configs.inc index e6ea6e3..e1dcdbb 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -33,6 +33,11 @@ WARN_QA:remove = "${EXTRA_QA}" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" +# enable webengine with commercial/proprietary features +DISTRO_FEATURES:append = " webengine" +LICENSE_FLAGS_WHITELIST = "commercial" +PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs ffmpeg" + PACKAGECONFIG:append:pn-qtbase = "\ tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \ sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \ @@ -73,5 +78,6 @@ PACKAGECONFIG:append:pn-qttranslations = " examples" PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples" PACKAGECONFIG:append:pn-qtwayland = " examples" PACKAGECONFIG:append:pn-qtwebchannel = " examples" +PACKAGECONFIG:append:pn-qtwebengine = " examples" PACKAGECONFIG:append:pn-qtwebsockets = " examples" PACKAGECONFIG:append:pn-qtwebview = " examples" diff --git a/coin/test-dunfell.inc b/coin/test-dunfell.inc new file mode 100644 index 0000000..1827495 --- /dev/null +++ b/coin/test-dunfell.inc @@ -0,0 +1 @@ +DISTRO_FEATURES_remove = "webengine" diff --git a/coin/test-gatesgarth.inc b/coin/test-gatesgarth.inc new file mode 100644 index 0000000..1827495 --- /dev/null +++ b/coin/test-gatesgarth.inc @@ -0,0 +1 @@ +DISTRO_FEATURES_remove = "webengine" diff --git a/coin/test-hardknott.inc b/coin/test-hardknott.inc deleted file mode 100644 index b86b8a1..0000000 --- a/coin/test-hardknott.inc +++ /dev/null @@ -1,3 +0,0 @@ -DISTRO_FEATURES:append = " webengine" -LICENSE_FLAGS_WHITELIST = "commercial" -PACKAGECONFIG:append:pn-qtwebengine = " examples proprietary-codecs ffmpeg"