Commit Graph

569 Commits

Author SHA1 Message Date
Martin Jansa
24f23ee49a packagegroup-qt6-commercial-modules: include qt6-commercial.inc
* all rdepends are skipped without Commercial Qt, make sure the
  packagegroup is skipped as well

* fixes:
  ERROR: Nothing RPROVIDES 'qmlcompilerplus' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qmlcompilerplus was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qmlcompilerplus' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qmlcompilerplus']
  ERROR: Nothing RPROVIDES 'qtvncserver' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qtvncserver was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qtvncserver' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qtvncserver']

Change-Id: I373c034989a643b5e95f84deb5130580201eddea
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit f26b62e29e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-18 05:34:34 +00:00
Andrej Valek
ed19d534a9 qt6-git: do not override CVE products
Some components use also base name in NVD CVE database product:
| sqlite> select * from products where product like 'qtbase';
| CVE-2019-18281|qt|qtbase|5.11.0|>=|5.11.3|<=
| CVE-2019-18281|qt|qtbase|5.12.0|>=|5.12.5|<
| sqlite> select * from products where product like 'qtsvg';
| CVE-2021-45930|qt|qtsvg|5.0.0|>=|5.15.2|<=
| CVE-2021-45930|qt|qtsvg|6.0.0|>=|6.2.1|<=

Change-Id: Ic8cbc59522731f49907e10bf08c6a00a213ae006
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d4f4b54f4e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-22 14:37:34 +00:00
Samuli Piippo
779e7613c3 Coin: fetch repo from github
Git clones from google fail frequently with:
   >> fatal: early EOF
   >> error: index-pack died
Switch to using github mirror for the git-repo repository.

Change-Id: Id0cbf3c59e50869d62880e56251b003490c4c1ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 61f984c49d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-09 21:26:56 +00:00
Samuli Piippo
37ea49ba0e qtmultimedia: add PACKAGECONFIGs for spatialaudio
Provides additional QML module for spatialaudio with QtQuick3D.

Change-Id: I4d10a430a6f162c94998ef4a9b20ef9e91897f18
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ff2d48090b)
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-02-28 13:27:45 +00:00
Qt Submodule Update Bot
316d85855b Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3e714196baa408065454d8b75771f515dfcb6e7e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-22 04:24:12 +00:00
Samuli Piippo
b291999483 coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-14 15:32:57 +00:00
Qt Submodule Update Bot
af2a107872 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I6bd110f09584d293207704a520aafe8813bd5734
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-10 22:20:50 +00:00
Qt Submodule Update Bot
b2458ac222 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ic3122c9245e0d56a27b3dce1cb0e1e3e86f034bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-01 00:39:26 +00:00
Samuli Piippo
cd751f5ae2 Use global variable for Qt version
Add a global variable that can be used whenever meta-qt6 layer is
included in the build to identify the Qt version.

Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a6f9d2499b)
2023-01-30 12:28:30 +00:00
Qt Submodule Update Bot
a2c2c0d703 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I122c2a65adfeb52ccab526d59f00adf349bba1a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-25 15:47:39 +00:00
Qt Submodule Update Bot
11ffce87a5 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ied1a4cd7c7296e2b47b5ab187e6edc4dbb90ca7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-24 12:33:46 +00:00
Qt Submodule Update Bot
366d1deea2 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I1e7f0f3a7e14895087a4c337e65416c666a34c89
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-23 15:36:01 +00:00
Qt Submodule Update Bot
b0e5d9311d Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Iea805036148c796a44856479004146f516af0253
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-20 21:46:28 +00:00
Samuli Piippo
f609437a8d qtbase: use correct path to libdir
Qt might be using different path to libs.

Change-Id: Iaf0721af1c5e74cd293437cb35c287bd820fa3a5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 91a21476ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:42 +00:00
Qt Submodule Update Bot
77fa2b021e Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I17586126bdb7d0c17fd26cb1f7f6bd6a81bbf75d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-19 02:07:35 +00:00
Qt Submodule Update Bot
ea20a4cf69 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I215a9573e1fbcf96d41b4a2e1688e7db7c593ef0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-17 14:53:44 +00:00
Qt Submodule Update Bot
d8a4d55a48 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I542a9d7ecd2afa4b4543228046dc0cc0a4414f05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-16 20:02:50 +00:00
Qt Submodule Update Bot
6510933717 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Idd3dd70cd62faa349b7ff68361e465ecb3e2093c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-13 20:06:02 +00:00
Qt Submodule Update Bot
62dd61663e Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3cb64b4f95b083b0e29c257e26f5f160ff9300ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-12 07:20:22 +00:00
Samuli Piippo
16ced76624 sdk: use security cflags in cmake toolchain file
Keep the SECURITY_CFLAGS set by Yocto builds also in the SKD's
CMake toolchain file. Instead remove only the fortify flags,
since they add unnecessary warnings when doing debug builds
with Qt Creator.

Change-Id: Ia01f92f21c4f68b1be0d57f9a586a34acbe2333c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a942032591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 07:20:13 +00:00
Samuli Piippo
2cdb899281 Support SDK workflow inside a Yocto build
Add support for using qmake directly from Yocto build sysroots
with following workflow:

bitbake meta-ide-support
bitbake build-sysroots
. ./tmp/deploy/images/qemuarm64/environment-setup-cortexa57-poky-linux
qmake & make

Use configurable sysroot paths in populate_qt6_sdk_base so that it can
be reused also for yocto build sysroots.

Fixes: QTBUG-108778
Change-Id: Iee48f75edbc62e5adcca318a9f4cf17b7477f4a0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 0533b8907e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 07:20:05 +00:00
Samuli Piippo
9412f99cda sdk: move sdk mkspec additions to qtbase recipe
The qmake mkspec additions are used with the sdk when the toolchain
environment-setup script hasn't been run. Instead of adding those in
the sdk creation phase, do it already in the qtbase recipe.

Change the mkspec also so that CC/CXX has only the compiler executable,
but none of the compile flags that usually are there in Yocto builds.
This keeps Qt Creator happier as well.

Task-number: QTCREATORBUG-27372
Change-Id: If27d595965df59ff9846f4c773469889a8480040
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit cfaf86d808)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 07:19:56 +00:00
Samuli Piippo
48d735ab6e Add workaround for broken harfbuzz cmake config
Latest harfbuzz 6.0.0 has bad cmake config that uses absolute paths,
which breaks static builds for Qt. Add workaroud that causes Qt
to use pkg-config to find correct paths for libs and includes.

From qtshadertools build:
ninja: error: '/usr/lib/libharfbuzz.so.0.60000.0', needed by
'lib/libQt6ShaderTools.a', missing and no known rule to make it

Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 23feda4f5b)
2023-01-12 07:19:31 +00:00
Qt Submodule Update Bot
6a158bd064 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I9ca22e621c1f27e6a886466ba350536d72110179
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-05 23:01:10 +00:00
Samuli Piippo
187f6dcc86 layer: add mickledore to LAYERSERIES_COMPAT
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ad7dc64e16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-05 10:02:21 +00:00
Qt Submodule Update Bot
cd1202213f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I9fbe3ff6e788cb2c3a96221be79bf477888ad1c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 07:37:41 +00:00
Samuli Piippo
4f7d02004c Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 918cb5b310)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-14 16:53:37 +00:00
Samuli Piippo
977b3c8e09 Don't validate the SRCREV value against the branch
Qt modules recently lost all their release branches in their git
repositories. This broke previous releases since bitbake validates
that SRCREV can be found from the current branch. Add additional
parameter to repo URI to stop bitbake from validating the SRCREV.

Task-number: QTBUG-109319
Change-Id: Ib61164839fdbc5938a23b92ab03f3c07e945812f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 28842c8014)
2022-12-12 13:57:07 +02:00
Samuli Piippo
8272a64f16 qtwayland: remove xcomposite PACKAGECONFIGs
The XComposite buffer sharing extensions have been removed from QtWayland.

Change-Id: I681ad58338567f8666f812c5acea4a7bbf9a87f4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 50fc8ccb9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-08 16:18:10 +00:00
Mikko Gronoff
23319d2f3e Bump PV to 6.4.3
Change-Id: I19fe4c0e54f7180426b16695b75af8fe1305705f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-12-05 09:29:10 +02:00
Qt Submodule Update Bot
6e3874cd75 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia31fb3b2fc94e39466531ee881627134c79d4657
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-01 13:56:24 +00:00
Qt Submodule Update Bot
2d57b22d6d Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia26334e6bd7e3ef6b484db1eeffe1777fae83692
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-30 11:30:32 +00:00
Mikko Gronoff
cdedef82ef Revert "webengine: add patch for python 3.11 build issue"
This reverts commit 2495915e3a.

Reason for revert: Included in upstream chromium with latest submodule update

Change-Id: I0d64185e1e5cb6aa181c18d4b758c4ca9e616395
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-30 11:30:30 +00:00
Qt Submodule Update Bot
94989d0eee Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib3a7feb697ea8765d87183eac6e82e8e0908ad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-22 12:49:05 +00:00
Qt Submodule Update Bot
52ed82f3d6 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3729006113b59690edcfb9eefc9bce70dc4861f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-19 06:22:29 +00:00
Qt Submodule Update Bot
2cbb86c271 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I0b504b13261bd8098c235ad2637eac04407b5889
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-15 01:31:19 +00:00
Qt Submodule Update Bot
360f0c7520 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I777e0b8e9b70fbb163456c362622cd7f2134ad66
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-12 03:04:30 +00:00
Samuli Piippo
e33f206aa7 sdk: add new class for populating qt6 sdk
Add new class that can be used to create toolchain containing
all available Qt modules.

Change-Id: I84982749ea9093bbbd20f99391b063c4bcaee39f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 63ba821b5c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-11 16:02:54 +00:00
Mikko Gronoff
68cd5cd824 Bump PV to 6.4.2
Change-Id: I1da65d00e7bd0027353373abad460a157335628d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-10 14:53:08 +02:00
Samuli Piippo
f79af87ebc qtbase: enable better image support for native builds
Enable jpeg support for qtbase-native, needed at least by shadergen.
To use system png, zlib needs to be enabled as well.

Change-Id: I0bea658d689fb99596374701b11aa9ce028e882d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4c5d3e2c3c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-10 07:19:38 +00:00
Samuli Piippo
b0b30c1e99 qtwebengine: add dependency to cups
Printing support needs cups in cases when it's not already enabled
in qtbase.

Change-Id: I5435bdd61b418f91524726571c9acd2cea92c729
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7731aab502)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 16:02:16 +00:00
Samuli Piippo
488d88cecd CI: tests against langdale
Update CI builds to use langdale instead of honister releases.

Change-Id: Ib18be53b6d3308d5e4c5a2269b40ce67a4c352ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0648a0a4ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 16:02:16 +00:00
Mikko Gronoff
2495915e3a webengine: add patch for python 3.11 build issue
yocto master branch updated python to 3.11, resulting
in webengine build error(s):

"File "/home/qt/work/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/qtwebengine/6.4.1-r0/git/src/3rdparty/chromium/tools/grit/grit/util.py", line 214, in ReadFile
with io.open(filename, mode, encoding=encoding) as f:
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ValueError: invalid mode: 'rU'"

Add patch from chromium upstream.

Change-Id: I6308d2acd17a74b20ad6651d59f34e7246dc96ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 676e6da41b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-03 08:09:50 +00:00
Qt Submodule Update Bot
3e19af3608 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I6f90ad07f7ed3d2249863735a5671c98b67292c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-03 08:09:28 +00:00
Qt Submodule Update Bot
cfbb672e4c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I2e5a33b5b517736b8f545be4c9ace34e2300cb16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-26 17:28:43 +00:00
Samuli Piippo
c8b68f42a6 Add license mapping for GFDL-1.3-no-invariants-only
Add license mapping for GFDL-1.3-no-invariants-only to use the GFDL-1.3
license file in older Yocto releases. This recudes warnings for missing
generic licenses.

Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit e950cff143)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:51:10 +00:00
Qt Submodule Update Bot
32f314a804 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I43fe57c91fd4b45565fefe5c1a5ed1c96a012fc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 02:13:06 +00:00
Samuli Piippo
1ff68d381d qtquick3dphysics: include the new cooker tool to images
QtQuick3DPhysics has a new runtime tool that should be included
in the images.

Change-Id: Ib6dd643217b1dea76ff42a48183f78427cc2eadf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 444b6cc7ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 12:03:30 +00:00
Qt Submodule Update Bot
b1098ad35f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ibb9446bd62789bd502029acf4363d18b1ac084d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-19 12:41:34 +00:00
Qt Submodule Update Bot
58494287fa Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3e1eadb02c8b057d1bfdb4232c46482ade664905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-18 20:00:45 +00:00