CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-04 16:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lts-6.2.5' into 6.2

Browse Source 
Change-Id: I32b5f8b0894cbbc3b09f73813794e365fdacc9ee
This commit is contained in:
Samuli Piippo 2023-01-31 12:32:51 +00:00
commit e944d9b5fe
59 changed files with 287 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -8,7 +8,6 @@ URI: https://git.openembedded.org/openembedded-core/
and optionally:
URI: https://git.openembedded.org/meta-openembedded/
URI: https://git.openembedded.org/meta-python2
Yocto version support
---------------------
@ -23,9 +22,9 @@ the LAYERSERIES_COMPAT (c).
| Yocto \ Qt | 6.2 | 6.1 | 6.0 |
| ---------- |:---:|:---:|:---:|
| master | x | | |
| kirkstone | x | | |
| honister | x | | |
| hardknott | x | x | x |
| hardknott | c | x | x |
| gatesgarth | c | x | x |
| dunfell | x | x | x |
@ -36,10 +35,17 @@ Qt is dual-licensed under commercial and open source licenses.
The license can be selected using the `QT_EDITION` variable. `commercial` and
`opensource` are valid values. The default value is `opensource`.
For commercial Qt users, the layer provides LTS (Long Term Support) releases
for selected Qt versions. These are available in branches named `lts-6.x`.
The LTS versions can only be built and used if you have a commercial Qt license
and you have set up SSH access to Qt Gerrit (see links below).
For commercial Qt users, the layer provides additional support with LTS
(Long Term Support) releases for selected Qt versions and additional
Qt modules licensed as commercial-only.
The LTS releases are available in branches named `lts-6.x`. The source code
for the LTS releases and the commercial Qt modules are only available for
commercial Qt license holders. They can only be built and used if you have
a commercial Qt license and you have set up SSH access to Qt Gerrit (see links below).
The commercial Qt modules are included in the build if the `QT_COMMERCIAL_MODULES`
variable is set to `1` and you are using a commercial edition of Qt.
QtWebEngine
-----------

4
classes/populate_sdk_qt6_base.bbclass
View File

@ -79,7 +79,7 @@ include_guard(GLOBAL)
get_filename_component(SYSROOTS \${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}ENV{PATH}")
set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}\$ENV{PATH}")
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${SDKTARGETSYSROOT}")
set(ENV{PKG_CONFIG_PATH} "${SDKTARGETSYSROOT}${libdir}/pkgconfig")
@ -98,7 +98,6 @@ set(CMAKE_C_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}gc
set(CMAKE_CXX_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}g++${EXE_EXT}")
set(TARGET_COMPILER_FLAGS "${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}")
set(TARGET_COMPILER_FLAGS_RELEASE "${TARGET_CFLAGS}")
set(TARGET_LINKER_FLAGS "${TARGET_LDFLAGS}")
include(CMakeInitializeConfigs)
@ -131,6 +130,7 @@ if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 1)
endif()
set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE PATH "Install path prefix")
set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
EOF
# resolve absolute paths at runtime

9
coin/module_config.yaml
View File

@ -17,7 +17,7 @@ machine_type:
#
# [target1] [target2] [target3] [target4]
# [machine] qemuarm64 qemux86 qemuarm qemux86-64
# [yocto] master honister hardknott dunfell
# [yocto] kirkstone honister kirkstone dunfell
# [X11] no no yes yes
# [mingw] no yes no no
#
@ -30,7 +30,7 @@ target1: &target1
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: master.xml
variableValue: kirkstone.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs post-inclusive wayland
@ -62,10 +62,10 @@ target3: &target3
variableValue: qemuarm
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: hardknott.xml
variableValue: kirkstone.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs pre-inclusive
variableValue: ci configs post-inclusive
enable_if:
condition: property
property: target.arch
@ -130,7 +130,6 @@ instructions:
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}
for conf in ${TEST_CONFIGS}; do

4
coin/test-ci.inc
View File

@ -1,5 +1,5 @@
SSTATE_DIR = "/mnt/yocto-cache/sstate-caches/${DISTRO_CODENAME}-meta-qt6"
BB_HASHSERVE = "yocto-cache.intra.qt.io:8686"
SSTATE_DIR = "/mnt/yocto-cache/sstate-caches/${DISTRO}-${DISTRO_CODENAME}"
BB_HASHSERVE = "yocto-cache.ci.qt.io:8686"
DL_DIR = "/mnt/yocto-cache/downloads"
BB_GENERATE_MIRROR_TARBALLS = "1"
BB_NUMBER_THREADS = "8"

11
coin/test-configs.inc
View File

@ -13,8 +13,8 @@ INHERIT += "rm_work"
# default to commercial Qt
QT_EDITION = "commercial"
# enable Qt QML Compiler
ENABLE_QMLCOMPILER = "1"
# include commercial addons and enable Qt QML Compiler
QT_COMMERCIAL_MODULES = "1"
# fast compression of SDK tar package
SDK_XZ_COMPRESSION_LEVEL = "-1"
@ -54,17 +54,23 @@ PACKAGECONFIG:append:pn-qtimageformats = " jasper"
PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
PACKAGECONFIG:append:pn-qt3d = " examples"
PACKAGECONFIG:append:pn-qt5compat = " examples"
#PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
PACKAGECONFIG:append:pn-qtbase = " examples"
PACKAGECONFIG:append:pn-qtcharts = " examples"
PACKAGECONFIG:append:pn-qtcoap = " examples"
PACKAGECONFIG:append:pn-qtconnectivity = " examples"
PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
PACKAGECONFIG:append:pn-qtdeclarative = " examples"
PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
PACKAGECONFIG:append:pn-qtimageformats = " examples"
PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
PACKAGECONFIG:append:pn-qtlottie = " examples"
PACKAGECONFIG:append:pn-qtmqtt = " examples"
PACKAGECONFIG:append:pn-qtmultimedia = " examples"
PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
PACKAGECONFIG:append:pn-qtopcua = " examples"
PACKAGECONFIG:append:pn-qtpdf = " examples"
PACKAGECONFIG:append:pn-qtpositioning = " examples"
PACKAGECONFIG:append:pn-qtquick3d = " examples"
PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
@ -75,7 +81,6 @@ PACKAGECONFIG:append:pn-qtsensors = " examples"
PACKAGECONFIG:append:pn-qtserialbus = " examples"
PACKAGECONFIG:append:pn-qtserialport = " examples"
PACKAGECONFIG:append:pn-qtshadertools = " examples"
PACKAGECONFIG:append:pn-qtspeech = " examples"
PACKAGECONFIG:append:pn-qtsvg = " examples"
PACKAGECONFIG:append:pn-qttools = " examples"
PACKAGECONFIG:append:pn-qttranslations = " examples"

5
conf/layer.conf
View File

@ -40,6 +40,11 @@ QT_GIT ?= "git://code.qt.io"
QT_GIT_PROTOCOL ?= "git"
QT_EDITION ?= "opensource"
QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
QT_COMMERCIAL_MODULES ?= "0"
# License mapping back to old license files
SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"

31
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb Normal file
View File

@ -0,0 +1,31 @@
DESCRIPTION = "Qt6 development host addon packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
nativesdk-qtapplicationmanager-dev \
nativesdk-qtapplicationmanager-tools \
nativesdk-qtquick3d-dev \
nativesdk-qtquick3d-tools \
nativesdk-qtremoteobjects-dev \
nativesdk-qtremoteobjects-tools \
nativesdk-qtscxml-dev \
nativesdk-qtscxml-tools \
nativesdk-qtshadertools-dev \
nativesdk-qtshadertools-tools \
nativesdk-qtwayland-dev \
nativesdk-qtwayland-tools \
${FORLINUXHOST} \
"
FORLINUXHOST:mingw32 = ""
FORLINUXHOST = " \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
"

11
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb Normal file
View File

@ -0,0 +1,11 @@
DESCRIPTION = "Qt6 development host commercial packages"
LICENSE = "MIT"
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
nativesdk-qmlcompilerplus-dev \
nativesdk-qmlcompilerplus-tools \
"

18
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-essentials.bb Normal file
View File

@ -0,0 +1,18 @@
DESCRIPTION = "Qt6 development host essential packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
#PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
nativesdk-qtbase-dev \
nativesdk-qtbase-tools \
nativesdk-qtdeclarative-dev \
nativesdk-qtdeclarative-tools \
nativesdk-qttools-dev \
nativesdk-qttools-tools \
"

34
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
View File

@ -1,43 +1,21 @@
DESCRIPTION = "Qt6 development host packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
nativesdk-make \
nativesdk-cmake \
nativesdk-ninja \
nativesdk-perl-modules \
${@bb.utils.contains('ENABLE_QMLCOMPILER', '1', 'nativesdk-qmlcompilerplus-dev nativesdk-qmlcompilerplus-tools', '', d)} \
nativesdk-qtapplicationmanager-dev \
nativesdk-qtapplicationmanager-tools \
nativesdk-qtbase-dev \
nativesdk-qtbase-tools \
nativesdk-qtdeclarative-dev \
nativesdk-qtdeclarative-tools \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
nativesdk-qtquick3d-dev \
nativesdk-qtquick3d-tools \
nativesdk-qtremoteobjects-dev \
nativesdk-qtremoteobjects-tools \
nativesdk-qtscxml-dev \
nativesdk-qtscxml-tools \
nativesdk-qtshadertools-dev \
nativesdk-qtshadertools-tools \
nativesdk-qttools-dev \
nativesdk-qttools-tools \
nativesdk-qtwayland-dev \
nativesdk-qtwayland-tools \
nativesdk-packagegroup-qt6-toolchain-host-essentials \
nativesdk-packagegroup-qt6-toolchain-host-addons \
${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'nativesdk-packagegroup-qt6-toolchain-host-commercial', '', d)} \
${FORLINUXHOST} \
"
RDEPENDS:${PN}:remove:mingw32 = " \
FORLINUXHOST:mingw32 = ""
FORLINUXHOST = " \
nativesdk-cmake \
nativesdk-ninja \
nativesdk-perl-modules \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
"

2
recipes-qt/packagegroups/packagegroup-qt6-addons.bb
View File

@ -8,7 +8,6 @@ inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
${@bb.utils.contains('ENABLE_QMLCOMPILER', '1', 'qmlcompilerplus', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
qt5compat \
qtapplicationmanager \
@ -35,7 +34,6 @@ RDEPENDS:${PN} += " \
qtserialbus \
qtserialport \
qtshadertools \
qtspeech \
qtsvg \
qttranslations \
qtvirtualkeyboard \

12
recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb Normal file
View File

@ -0,0 +1,12 @@
DESCRIPTION = "Qt6 commercial addon modules"
LICENSE = "MIT"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
qmlcompilerplus \
"

1
recipes-qt/packagegroups/packagegroup-qt6-modules.bb
View File

@ -10,4 +10,5 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS:${PN} += " \
packagegroup-qt6-essentials \
packagegroup-qt6-addons \
${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'packagegroup-qt6-commercial-modules', '', d)} \
"

1
recipes-qt/qt6/gn-native_git.bb
View File

@ -3,6 +3,7 @@ require recipes-qt/qt6/qtwebengine.inc
inherit native
OECMAKE_SOURCEPATH = "${S}/src/gn"
OECMAKE_TARGET_COMPILE = "gn"
cmake_do_install() {
eval DESTDIR='${D}' ${CMAKE_VERBOSE} cmake --install '${B}'

10
recipes-qt/qt6/qmlcompilerplus_git.bb
View File

@ -7,15 +7,7 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
python() {
if d.getVar('QT_EDITION') != 'commercial':
raise bb.parse.SkipRecipe('Available only with Commercial Qt')
}
QT_GIT = "git://codereview.qt-project.org"
QT_GIT_PROTOCOL = "ssh"
QT_MODULE = "tqtc-qmlcompilerplus"
include recipes-qt/qt6/qt6-commercial.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qt3d_git.bb
View File

@ -14,6 +14,7 @@ inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"

1
recipes-qt/qt6/qt5compat_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

9
recipes-qt/qt6/qt6-commercial.inc Normal file
View File

@ -0,0 +1,9 @@
python() {
if d.getVar('QT_EDITION') != 'commercial':
raise bb.parse.SkipRecipe('Available only with Commercial Qt')
}
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE = "tqtc-${BPN}"
QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"

85
recipes-qt/qt6/qt6-git.inc
View File

@ -2,59 +2,60 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des
HOMEPAGE ?= "https://www.qt.io"
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "6.2"
QT_MODULE_BRANCH ?= "6.2.5"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
QT_MODULE_REPO ?= "${QT_MODULE}.git"
SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"
PV = "6.2.4"
PV = "6.2.5"
SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "71c0f559e8f2daa6dcf969f770b05f943114915e"
SRCREV_qt3d = "217c70b0c7ef105eb86ebd0cf504558cf5187898"
SRCREV_tqtc-qmlcompilerplus = "854f58174dace9730281c2801ba0bfcaaac2a7bf"
SRCREV_qt3d = "a573e1604963c7dc89ef7d24b80cf9e6e4e696cb"
SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
SRCREV_qt5compat = "a3f3095ff48410420170b42f3b104cbdc2b9e466"
SRCREV_qtbase = "7a5b98e0fefcbf061cb9e3d9edecc75fff364519"
SRCREV_qtapplicationmanager = "f4e6e09ee99525e6918c11f78c4ccd3a8eeef5d8"
SRCREV_qtcharts = "d92b784fbc8e26dce8b283e98c2f1382899a2176"
SRCREV_qtcoap = "5275848d38aa8e7684906987d89acb1ec270e1fd"
SRCREV_qtconnectivity = "39920cdea033549ef552025199e94fa40faca573"
SRCREV_qtdatavis3d = "5c083e88340c6e74d97fe27c06c9f332329a1914"
SRCREV_qtdeclarative = "39bc38d85abef1d7a471a335cdec1773b19aa6e8"
SRCREV_qtdeviceutilities = "87de395321839bd47c64231f809a0ee8af417f03"
SRCREV_qtimageformats = "33ef2f1268c796f8260d4b6134fc55ed102612ab"
SRCREV_qtinterfaceframework = "6ce3c780ad32be96b43459bccd4eec267f0e66d6"
SRCREV_qtlottie = "26136083464e1f25d7a13f8a75d03be6b7871b64"
SRCREV_qtmqtt = "0e9cfc9c9a05e44dff5d46d8eb75616c98fef33a"
SRCREV_qtmultimedia = "315d0f848a67c33390e787c094c16d496601a042"
SRCREV_qtnetworkauth = "f4f5ec226a618e9263627351d0221118855aa9a9"
SRCREV_qtopcua = "5d7398c4f9117be73e2eb19f1ab323be113bae14"
SRCREV_qtpositioning = "8493aed573be00307e49336120a723634ea5073e"
SRCREV_qtquick3d = "fbf5e5bf500315d3dc20fbd1039c747c40a9a545"
SRCREV_qt5compat = "420a59b9e1c9e736ecf985c5e85e9641126ca97e"
SRCREV_qtbase = "282ce3e3cc21189e9e916ced7a0e3c10d10413fe"
SRCREV_qtapplicationmanager = "3784dc7f718c029098bbbc31a2212e90f7adb047"
SRCREV_qtcharts = "a9d56cc323034c561801660abb56c183e65fe579"
SRCREV_qtcoap = "c29973b0aa4c851267294b9879d612040da687aa"
SRCREV_qtconnectivity = "7d6a53b2ff1b124a7ffc0172ea791a9a825c26c4"
SRCREV_qtdatavis3d = "d71e96afafd007e5bea781ec9ba4e8827d560b00"
SRCREV_qtdeclarative = "09b9a4904d80ae9fc5ecd0ef249c2742337b6234"
SRCREV_qtdeviceutilities = "d1a7e6770beaa051aa645de213cd28321c7602ba"
SRCREV_qtimageformats = "60161f32e947261a89bd1e1c6e727ee86c7c725b"
SRCREV_qtinterfaceframework = "8894df32f67153016763305d02006a0437c36e10"
SRCREV_qtlottie = "674267f3464707e383df6a53f2a151e854fb15e9"
SRCREV_qtmqtt = "f03c529357e31c306ccb3d2a77e8ac0b458286bb"
SRCREV_qtmultimedia = "49eebff2798bd50e4a17b7b2066b100cdfdf62fa"
SRCREV_qtnetworkauth = "21b27ea58a6f6faa3f6491e9308536af2f377fd1"
SRCREV_qtopcua = "0e894f2322d19d1c6361fd3d4da460510374ee64"
SRCREV_qtpositioning = "f38039cbf6050b5b352137534027bb90907ac032"
SRCREV_qtquick3d = "9eff929cffa3faeb87bda0c98abad59e3786e947"
SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
SRCREV_qtquickdesigner-components = "246e9b8ab3b899d708403a2810fcb24e3111e58a"
SRCREV_qtquicktimeline = "3987474b0b864c2f08f83410583342293c7c2290"
SRCREV_qtremoteobjects = "8abf7e45c9363fa55133314e606135fdfc6c544c"
SRCREV_qtscxml = "956398321c8700111eb6ad272f81ab145170a734"
SRCREV_qtsensors = "5b8d6dfccdab9e06db0342e97852a245bb4a8c05"
SRCREV_qtserialbus = "171eee6e1d1ddd552f7dc164fce63a3cf637fa37"
SRCREV_qtserialport = "93dedd62256840768a59218b671ef00b8cce5eb8"
SRCREV_qtshadertools = "fe2eb51d2f0202647f96afbefe3b4755f9084cc4"
SRCREV_qtspeech = "462c3384467cec55a31fde11afb959321063a0ce"
SRCREV_qtsvg = "14e98376df944cd3b42368590341683a29ec580c"
SRCREV_qttools = "e06e2b240b885af7907cbe01e2c0cd539e094094"
SRCREV_qtquickdesigner-components = "532cabf950f13d4dc04fb8b14f5eed20b6afc6fa"
SRCREV_qtquicktimeline = "d123a4b034c02078cce1c1f3a891c0351d024f56"
SRCREV_qtremoteobjects = "6b239a6729f638f8b3bb83c380abecaabf8e8555"
SRCREV_qtscxml = "683f2ab3e7ac634320db51eacd524b87076b6258"
SRCREV_qtsensors = "535e70e3dadca9dc1e627a0c6aa5ab2ee00c11f2"
SRCREV_qtserialbus = "9f884f97074230fba34f323dbd43186098548079"
SRCREV_qtserialport = "6edb1452194cd4e6af89d1403bb9701b53bbc413"
SRCREV_qtshadertools = "71124e3ec51eb7ef4ebc3a849c6095af3c87240e"
SRCREV_qtspeech = "36660168791b5e86561661b1987d741757cf7be3"
SRCREV_qtsvg = "1494ae38d626f0d1a084abb113528aa0e0fce7f4"
SRCREV_qttools = "7ba1b3827d59790ab2bdac6c0c65122b515af265"
SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38"
SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01"
SRCREV_qttranslations = "1504595a0fd268f32c7b46b47fe38d777edf02f7"
SRCREV_qtvirtualkeyboard = "d8c2c599657063c1da9ba0c8b155e10c3b1c7e12"
SRCREV_qtwayland = "3dadcd5b4b3c21b785dd10c67904c48ce03a9023"
SRCREV_qtwebchannel = "a98f54ededcdff3769618f0beff48c6049176ab1"
SRCREV_qtwebengine = "e34a05ecf0b1e158130f8d4e2d6fcf2aa432cc4b"
SRCREV_qtwebengine-chromium = "e55302f0a9c6224860358a98a58ffb4dbc67cb82"
SRCREV_qtwebsockets = "450eb8d57b1cc3d5201c3f239eec2a38a47df097"
SRCREV_qtwebview = "d6525805adb5b6992384bdf576e68ca5450b3c1a"
SRCREV_qttranslations = "25232b8373ecac082be8ffe45309126815e1bd2d"
SRCREV_qtvirtualkeyboard = "28af48825739ac2b0c0547b8cb73fcdbf985a4da"
SRCREV_qtwayland = "4827bd2c8a0cda1308022ae11b68dffb31828996"
SRCREV_qtwebchannel = "63c4fb4e83e76abfb06686b1ac83fc6cbfb2756c"
SRCREV_qtwebengine = "5e66e41c69b701e3fed9c80c44592f66f386699f"
SRCREV_qtwebengine-chromium = "660d61d9f1886367e12e741f8793df7589759695"
SRCREV_qtwebsockets = "26b35b0ef12c9ea04d57252c5c78543767309d18"
SRCREV_qtwebview = "b5274e3a5de5d36818d2cdbafb2976b47e46289c"

5
recipes-qt/qt6/qt6-lts.inc Normal file
View File

@ -0,0 +1,5 @@
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE_REPO = "tqtc-${QT_MODULE}.git"
QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"

2
recipes-qt/qt6/qt6.inc
View File

@ -21,7 +21,7 @@ python __anonymous() {
d.setVar("PACKAGE_ARCH", tarch)
}
ENABLE_QMLCOMPILER ?= '0'
ENABLE_QMLCOMPILER ?= "${QT_COMMERCIAL_MODULES}"
python __anonymous() {
if (d.getVar('QT_EDITION', True) != 'commercial' or
d.getVar('ENABLE_QMLCOMPILER', True) == '0' or

1
recipes-qt/qt6/qtapplicationmanager_git.bb
View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"

29
recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch
View File

@ -1,29 +0,0 @@
From c15033fd4df14b08fc28ec8da61c990801c7e411 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 16 Dec 2021 13:10:48 +0200
Subject: [PATCH] Do not use QT_TOOLCHAIN_RELOCATABLE paths in
qt.toolchain.cmake
The calculated paths for QT_TOOLCHAIN_RELOCATABLE paths point to
host sysroot which must not be used when cross-compiling other projects.
Upstream-Status: Inappropriate [embedded specific]
---
cmake/qt.toolchain.cmake.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
index 5e9acd66b8..451de99633 100644
--- a/cmake/qt.toolchain.cmake.in
+++ b/cmake/qt.toolchain.cmake.in
@@ -68,8 +68,8 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_
# Instead of collapsing the search prefix (which is the case when one is a subdir of the other),
# it concatenates them creating an invalid path. Workaround it by setting the root path to the
# Qt install prefix, and the prefix path to the lib/cmake subdir.
-list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
-list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
+#list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
+#list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
# Let CMake load our custom platform modules.
# CMake-provided platform modules take precedence.

47
recipes-qt/qt6/qtbase/0004-Fix-qt.toolchain.cmake-for-SDK-use.patch Normal file
View File

@ -0,0 +1,47 @@
From e3f59a24add346248842a8f28971621469c9161f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 16 Dec 2021 13:10:48 +0200
Subject: [PATCH] Fix qt.toolchain.cmake for SDK use
Set initial host path based on the location of the qt.toolchain.cmake file.
This helps us avoid need to relocate the file in SDK.
The calculated paths for QT_TOOLCHAIN_RELOCATABLE paths point to
host sysroot which must not be used when cross-compiling other projects.
Change-Id: I52aa2a10d2a13fd27d6bf8b4af6dc1833c7a286a
Upstream-Status: Inappropriate [embedded specific]
---
cmake/qt.toolchain.cmake.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
index c565e923ff..a917c65d89 100644
--- a/cmake/qt.toolchain.cmake.in
+++ b/cmake/qt.toolchain.cmake.in
@@ -70,8 +70,8 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_
# Instead of collapsing the search prefix (which is the case when one is a subdir of the other),
# it concatenates them creating an invalid path. Workaround it by setting the root path to the
# Qt install prefix, and the prefix path to the lib/cmake subdir.
-list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
-list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
+#list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
+#list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
# Let CMake load our custom platform modules.
# CMake-provided platform modules take precedence.
@@ -156,10 +156,10 @@ endif()
# Set up QT_HOST_PATH and do sanity checks.
# A host path is required when cross-compiling but optional when doing a native build.
set(__qt_toolchain_host_path_required "@qt_host_path_required@")
-set(__qt_toolchain_initial_qt_host_path
- "@qt_host_path_absolute@")
-set(__qt_toolchain_initial_qt_host_path_cmake_dir
- "@qt_host_path_cmake_dir_absolute@")
+get_filename_component(__qt_toolchain_initial_qt_host_path
+ "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+get_filename_component(__qt_toolchain_initial_qt_host_path_cmake_dir
+ "${CMAKE_CURRENT_LIST_DIR}/../../../lib/cmake" ABSOLUTE)
# QT_HOST_PATH precedence:
# - cache variable / command line option

7
recipes-qt/qt6/qtbase_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/conan.inc
@ -18,7 +19,7 @@ SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0003-tests-disable-failing-tests.patch \
file://0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch \
file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
"
DEPENDS += "\
@ -71,6 +72,7 @@ QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb'
PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
@ -156,7 +158,7 @@ do_install:append:class-nativesdk() {
install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "")
set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "")
set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
EOF
RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
@ -166,7 +168,6 @@ EOF
RELPATH=${@os.path.relpath(d.getVar('prefix') + '/share/cmake/Qt6Toolchain.cmake', d.getVar('QT6_INSTALL_LIBDIR') + '/cmake/Qt6')}
sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6/qt.toolchain.cmake \
-e 's|${RECIPE_SYSROOT_NATIVE}|\${CMAKE_CURRENT_LIST_DIR}/../../../..|' \
-e "s|/.*/toolchain.cmake|\${CMAKE_CURRENT_LIST_DIR}/$RELPATH|"
}

1
recipes-qt/qt6/qtcharts_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtcoap_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtconnectivity_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# QTBUG-93565

1
recipes-qt/qt6/qtdatavis3d_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"

1
recipes-qt/qt6/qtdeviceutilities_git.bb
View File

@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
inherit qt6-cmake
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
RDEPENDS:${PN} = "connman"

1
recipes-qt/qt6/qtimageformats_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

3
recipes-qt/qt6/qtinterfaceframework_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
python() {
@ -41,6 +42,8 @@ FILES:${PN}-refapi-vehiclefuntions = "\
DEPENDS += "qtbase qtinterfaceframework-native"
PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
PACKAGECONFIG ?= "ifcodegen remoteobjects interfaceframework \
${PACKAGECONFIG_REFERENCE_API} \
${PACKAGECONFIG_SIMULATION} \

1
recipes-qt/qt6/qtlottie_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtmqtt_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtmultimedia_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native"

1
recipes-qt/qt6/qtnetworkauth_git.bb
View File

@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtopcua_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "qml"

1
recipes-qt/qt6/qtpositioning_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"

1
recipes-qt/qt6/qtquicktimeline_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtremoteobjects_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"

1
recipes-qt/qt6/qtscxml_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtscxml-native"

1
recipes-qt/qt6/qtsensors_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtserialbus_git.bb
View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtserialport_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtshadertools_git.bb
View File

@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtshadertools-native"

15
recipes-qt/qt6/qtspeech_git.bb
View File

@ -1,15 +0,0 @@
LICENSE = "GFDL-1.3 & (LGPL-3.0-only | GPL-2.0-or-later) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
"
inherit qt6-qmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtsvg_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qttools_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += " \

1
recipes-qt/qt6/qttranslations_git.bb
View File

@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qttools qttools-native"

1
recipes-qt/qt6/qtvirtualkeyboard_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# To enabled Nuance T9 Write support, you need to provide the licensed components

1
recipes-qt/qt6/qtwayland_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI +="\

1
recipes-qt/qt6/qtwebchannel_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

15
recipes-qt/qt6/qtwebengine.inc
View File

@ -1,8 +1,8 @@
LICENSE = "BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0-only | The-Qt-Company-Commercial )"
LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0-only | The-Qt-Company-Commercial )"
LIC_FILES_CHKSUM = " \
file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@ -11,24 +11,19 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
inherit gettext
inherit perlnative
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
python() {
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
}
inherit python3native
# we don't want gettext.bbclass to append --enable-nls
def gettext_oeconf(d):
return ""
QT_MODULE = "qtwebengine"
QT_MODULE_BRANCH_CHROMIUM = "90-based"
QT_MODULE_BRANCH_CHROMIUM = "94-based"
FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"

29
recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch
View File

@ -1,23 +1,25 @@
From 7c16e38b85e514991d57802136de498ac1201bca Mon Sep 17 00:00:00 2001
From 6819917c14b55c4352dbd200bb6ab297bfd243fa Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Aug 2021 15:09:41 +0300
Subject: [PATCH] CMake: use generated yocto toolchains
Bitbake knows how to generate working toolchains, use those instead of
ones done by webengine. No need to use separate host pkg-wrapper with
these toolchain.
these toolchain. No need to do separate host build, we'll use the
target binaries where needed.
Upstream-Status: Inappropriate [embedder specific]
Upstream-Status: Inappropriate [embedded specific]
Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
---
cmake/Functions.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
src/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 37fd593a..2654cdc3 100644
index 89f4cdd39..8845c94f7 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -642,7 +642,7 @@ endfunction()
@@ -750,7 +750,7 @@ endfunction()
macro(create_pkg_config_host_wrapper buildDir)
find_package(PkgConfigHost)
@ -26,7 +28,7 @@ index 37fd593a..2654cdc3 100644
create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
endif()
@@ -855,9 +855,9 @@ endmacro()
@@ -979,9 +979,9 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
list(APPEND gnArgArg
@ -39,3 +41,16 @@ index 37fd593a..2654cdc3 100644
)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 921871bee..c6141988b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ endif()
# HOST PROJECT
##
-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
+if(FALSE)
if(NOT Gn_FOUND)
message(FATAL_ERROR "\nHost gn not found - cross compilation not possible")

4
recipes-qt/qt6/qtwebengine_git.bb
View File

@ -10,6 +10,7 @@ DEPENDS += " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst libxkbfile', '', d)} \
qtbase qtdeclarative qtdeclarative-native \
gn-native \
python3-html5lib-native \
"
EXTRA_OECMAKE += "\
@ -25,10 +26,7 @@ SECURITY_STRINGFORMAT = ""
PACKAGECONFIG ??= "\
${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
freetype \
glib \
harfbuzz \
icu \
libevent \
libjpeg \
libpci \

1
recipes-qt/qt6/qtwebsockets_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtwebview_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"