Commit Graph

575 Commits

Author SHA1 Message Date
Andrej Valek
d4f4b54f4e 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|<=

Pick-to: 6.5 6.4 6.2
Change-Id: Ic8cbc59522731f49907e10bf08c6a00a213ae006
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-22 14:03:11 +00:00
Samuli Piippo
a55215df48 coin: be explicit about accepted commercial licenses
Dunfell is only branch that still uses the old whitelist variable.
Rename the include file and be specific what commercial recipes the
build needs. Remove the separate post-inclusive include file and move
the accepted commercial license variable to common include file.

Pick-to: 6.5
Change-Id: Ic80b42d71037637298c805a60f20c8737f00b026
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-03-22 14:02:58 +00:00
Qt Submodule Update Bot
2ce7415544 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1da1c9b6b95d5d4d3f20b9b63b9b9c2687179fa0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-22 04:27:11 +00:00
Qt Submodule Update Bot
ab985c2b26 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1af8a1c4bdf7d5f925ac064e0a9bf351dd620724
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-20 13:52:52 +00:00
Samuli Piippo
e44a806e40 qtgrpc: add dependency to declarative for examples
Additional examples depend on QtQuick.

Pick-to: 6.5
Change-Id: I0373dc10d072f75c4f099131aa9b6d7876e17808
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-20 13:52:50 +00:00
Samuli Piippo
858a8773e0 qtbase: refresh patch
Fuzz detected.

Change-Id: I09e53fe47a8e01384fce9bdf5960f3c4f1f51093
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 60fc617037)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-20 13:52:49 +00:00
Samuli Piippo
0c6fa29d50 Revert "qtbase: fix native build"
This reverts commit 8673fed36e.
Fix has been merged in qtbase.

Change-Id: I76080c148d29090254d5be613469ac48532031c7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-20 13:52:48 +00:00
Samuli Piippo
b794bfbd8b qtspeech: add dependency to qtmultimedia
QtSpeech now has hard dependency to QtMultimedia.

Change-Id: I61e2d73c004b225678c040c0096c38c2ea8597a7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-20 13:52:46 +00:00
Samuli Piippo
0df94cceef qtbase: update patches
Fuzz detected.

Change-Id: I13269e8d0cf239f32348e70dec3e2e7fb6e2cc84
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a6bdb1e987)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-20 13:52:45 +00:00
Samuli Piippo
e136d33bc5 Revert "qtbase: workaround broken config for librt"
This reverts commit 36006c9897.
CMake configuration was fixes in qtbase.

Change-Id: I036e1045a4ea79a864a02afe81e7e477d23a7a86
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-20 13:52:44 +00:00
Michal Klocek
aec03e788c Add python3-html5lib to sdk
This is required by qtwebenigne to be compiled with sdk.

Pick-to: 6.5
Change-Id: I0053ca241c1b60b60edbc99f0830434a1d95f92d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-15 13:55:52 +01:00
Samuli Piippo
61f984c49d 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.

Pick-to: 6.5 6.5.0 6.4 6.4.3 6.2
Change-Id: Id0cbf3c59e50869d62880e56251b003490c4c1ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-09 11:16:50 +00:00
Ari Parkkila
ea4489ce49 Change GCC optimization for qtwebengine on armv7a-neon
Disable -O2 optimization to avoid SIGBUS alignment failure, see
GCC compiler bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97473

Fixes: QTBUG-109565
Pick-to: 6.5 6.5.0
Change-Id: I4e6b2c27ad851666b1f25d472932b601442d2fe6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-07 08:25:50 +02:00
Samuli Piippo
4862c58253 qtmultimedia: make default backend configurable
QtMultimedia provides gstreamer and ffmpeg backends where ffmepg is the
default backend. Add configuration that allows changing the default
backend and make gstreamer the default one.

Pick-to: 6.5
Change-Id: I1d9f8916508ddf11c1ef2908543d77e12acdf0bc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-27 08:04:09 +00:00
Samuli Piippo
ff2d48090b qtmultimedia: add PACKAGECONFIGs for spatialaudio
Provides additional QML module for spatialaudio with QtQuick3D.

Pick-to: 6.5 6.4
Change-Id: I4d10a430a6f162c94998ef4a9b20ef9e91897f18
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-27 08:04:03 +00:00
Samuli Piippo
a162d8c5a6 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.

Pick-to: 6.5 6.4 6.2
Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-14 11:27:40 +00:00
Samuli Piippo
f395b92330 qttools: update revision
Needed to fix example build.

Change-Id: I784581fc50a5219bb6dff8cb5d8236833ba7937f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-10 07:36:50 +00:00
Samuli Piippo
36006c9897 qtbase: workaround broken config for librt
Posix shared memory feature depends on librt which is used from
uninative package in native build. CMake doesn't find it there,
which breaks the build. Workaround this by disabling the feature.

Task-number: QTBUG-111049
Change-Id: I68ab6fd2f4d0520f125dd8e3c13266477dfc26c1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-10 07:36:49 +00:00
Qt Submodule Update Bot
f555df08fc Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia06554a6ef955d0307c49ccbdb3f4f8cf2212110
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-10 07:36:48 +00:00
Samuli Piippo
8673fed36e qtbase: fix native build
Temporary patch until fixed in qtbase.

Change-Id: I0982ac5ee3c8243cff018c6a403e4c434a92aebb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-10 07:36:45 +00:00
Samuli Piippo
8454efd1ed protobuf: remove upstreamed fix
The protobuf fix is now available in meta-openembedded.

Pick-to: 6.5
Change-Id: I83e911b64cf35767af22b76c19ea27ce818e300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-31 16:38:52 +00:00
Samuli Piippo
b1db9ca0d5 qtbase: enable kms platform plugin by default
Most targets can already use the kms/gbm platform plugins, so enabled
them by default. Targets that don't provide them can override the
PACKAGECONFIG_GRAPHICS to define which graphic backend they support.

Pick-to: 6.5
Change-Id: I85b310608772884134a63138781aad9fa1220110
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-31 09:08:54 +00:00
Samuli Piippo
a6f9d2499b 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.

Pick-to: 6.5 6.4 6.2
Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-30 06:24:38 +00:00
Samuli Piippo
8c17fb058a qtgrpc: include host tools in the toolchain
Add fix for protobuf so that we can build and include nativesdk-qtgrpc
in the toolchain. The protobuf fix has been merged in meta-openembedded
master, but not in langdale.

Pick-to: 6.5
Change-Id: I37a90e1a79d64a8154ab6fb510a9d8d5cf6d26c5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-27 10:39:06 +00:00
Samuli Piippo
fdf3b8ae41 qttranslations: add catalogs.json into dev package
A new catalogs.json file is created for deployment purposes.
Include it a dev package.

Change-Id: I2e28c9ee886d8f09a79c5f13cf38e47cb2dc81f0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit b6928361f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-25 13:38:24 +00:00
Samuli Piippo
47416406c4 qtwebengine: update chromium revision
Task-number: QTBUG-110272
Change-Id: Ic031c857483777deeacbd65f7beaf7c007fccb08
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit de89ed0547)
2023-01-20 13:56:47 +00:00
Samuli Piippo
9ad2cce88e qtbase: move xkbcommon and glib to defaults
Both xkbcommon (for keyboard handling) and glib (for eventloop)
are useful also without X11. Move them to default PACKAGECONFIGs.

Pick-to: 6.5
Change-Id: Ib298a0916d781fd11c0e4ad53dc642734d60ca3b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-20 13:56:39 +00:00
Samuli Piippo
91a21476ab qtbase: use correct path to libdir
Qt might be using different path to libs.

Pick-to: 6.5 6.4 6.2
Change-Id: Iaf0721af1c5e74cd293437cb35c287bd820fa3a5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-20 13:56:27 +00:00
Samuli Piippo
a11e036440 qtbase: fix scripts from libexec dir
Some of the scripts were moved to libexec dir, which must also
be patched.

Pick-to: 6.5
Change-Id: I2099f61f8dbdf8d4eed010de146f18146585a40e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-20 13:56:20 +00:00
Samuli Piippo
cf715572cb qtmultimedia: enable ffmpeg backend
The ffmpeg backend is now the default backend for qtmultimedia.
Environment variable QT_MEDIA_BACKEND can used at runtime to
selected between the ffmpeg and gstreamer backends.

Pick-to: 6.5
Change-Id: I751737fd7adaeeceb58e889765435750f3c3f274
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-19 09:14:36 +00:00
Mikko Gronoff
c80c820012 webengine: update chromium branch
Webengine updated to chromium 108 branch.

Change-Id: Ia67581eee6d0963b77bd4d60724d2845d03f94bd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit f4c32a89eb)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-01-18 20:30:00 +00:00
Qt Submodule Update Bot
a4f7961feb Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie0a2150d3e711e198cf0e0955f9a06fefbf07500
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-18 20:29:59 +00:00
Samuli Piippo
56710e8724 Add recipe for QtInsightTracker
QtInsightTracker is a commercial-only module.

Task-number: ANALYTICS-237
Task-number: QTBUG-108568
Pick-to: 6.5
Change-Id: I30412dec8552898b76865402c2e2ccfcae8d1904
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-16 16:12:21 +00:00
Samuli Piippo
a942032591 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.

Pick-to: 6.5 6.4 6.2
Change-Id: Ia01f92f21c4f68b1be0d57f9a586a34acbe2333c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-11 14:45:32 +00:00
Samuli Piippo
0533b8907e 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
Pick-to: 6.5 6.4 6.2
Change-Id: Iee48f75edbc62e5adcca318a9f4cf17b7477f4a0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-11 14:45:27 +00:00
Samuli Piippo
cfaf86d808 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.

Pick-to: 6.5 6.4 6.2
Task-number: QTCREATORBUG-27372
Change-Id: If27d595965df59ff9846f4c773469889a8480040
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-11 14:45:22 +00:00
Samuli Piippo
23feda4f5b 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

Pick-to: 6.5 6.4
Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-11 14:45:12 +00:00
Qt Submodule Update Bot
cfbcd5f4f1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Id9246b401328e0f3bc9c04b42e37a9361dce34d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-05 10:32:10 +00:00
Samuli Piippo
ad7dc64e16 layer: add mickledore to LAYERSERIES_COMPAT
Pick-to: 6.5 6.4
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-04 08:22:41 +00:00
Qt Submodule Update Bot
be98220dcf Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Icbe7a67e02e34bf42f1b1b2f1e870559be560d1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 16:21:38 +00:00
Samuli Piippo
afcf7b2858 qtvncserver: update license files
Change-Id: I29db1238fa7fd5222fe18c60b4446a076f56f412
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-03 16:21:36 +00:00
Samuli Piippo
6826a6aa09 readme: add 6.5 branch details
Pick-to: 6.5
Change-Id: I580b98bac50e57aad08af540ede6646f6801bc4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-03 11:12:54 +02:00
Samuli Piippo
ee488f6111 qtvncserver: update license checksum
Module switched to SPDX license headers.

Change-Id: I84ab9ab1b9228fe714d940035500b38ed1198ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-12-22 05:43:08 +00:00
Qt Submodule Update Bot
d2a6f8bcf1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I84a183df6a6a360998ea3f3a48544280bef5806d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-22 05:43:07 +00:00
Mikko Gronoff
98edd0f33d Bump PV to 6.6.0
Update/replace previous version update commit
35cf4c22b1, dev branch
is the future 6.6.

Change-Id: I7a57abbf64a5219271dc7fbf5a9fe84de1d038a3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-12-19 09:01:14 +02:00
Qt Submodule Update Bot
22ae587790 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I5313d97dc76405a1171d44ba4117a7218459a97f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-16 22:53:51 +00:00
Mikko Gronoff
35cf4c22b1 Bump PV to 6.5.1
Change-Id: I7fc0d86aac9ad4304b079fbab316dcf77b577033
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-12-15 09:11:15 +02:00
Samuli Piippo
918cb5b310 Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Pick-to: 6.5 6.4 6.2
Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-14 11:38:54 +00:00
Qt Submodule Update Bot
124fd6fd54 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia6f93574b24e543e479169897f2d050fc949c0c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-13 01:06:41 +00:00
Samuli Piippo
28842c8014 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.

Pick-to: 6.4 6.4.2 6.2
Task-number: QTBUG-109319
Change-Id: Ib61164839fdbc5938a23b92ab03f3c07e945812f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-12 06:39:37 +00:00