Commit Graph

595 Commits

Author SHA1 Message Date
Samuli Piippo
7bf38723c9 packagegroups: enable workaround for allarch packagegroup
Enable workaround for the sanity check of allarch packagegroups
which caused
ERROR: nativesdk-packagegroup-qt6-toolchain-host-essentials-1.0-r0
  do_package_write_rpm: An allarch packagegroup shouldn't depend on
  packages which are dynamically renamed (nativesdk-qttools-dev
  to nativesdk-libqt6uitools-dev)

Nativesdk changes the PACKAGE_ARCH correctly, but it cannot be
inherited first because that would throw another sanity warning.

Fixes: QTBUG-113178
Change-Id: Ifd77ef76f37b9fe39ef38adcc28c87130bf6d6d4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5b387fd78d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-28 10:53:46 +00:00
Qt Submodule Update Bot
169b252fcd Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib98e7fd82ad396f15bbaf332e2b24a103c4f48e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-26 23:57:22 +00:00
Qt Submodule Update Bot
20dfcfc5e6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I1c73a17f1712c3c46f9b9803290d5ea87046244f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-21 16:59:35 +00:00
Samuli Piippo
671b41ca4b coin: test against mickledore
Add testing against Yocto 4.2 mickledore.

Change-Id: If69b95726e858849470ed433235916811501aed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7931febe45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-21 10:03:21 +00:00
Samuli Piippo
5362dfd3c9 qtwayland: enable all wayland drivers
Remove separate dmabuf PACKAGECONFIGs and let qtwayland
enable all client buffer integration plugins it can.

Task-number: QTBUG-112725
Change-Id: Ic841f3349fee36e5207d9b60e5733ac8ee79ee56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8f50970006)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-19 11:10:45 +00:00
Samuli Piippo
01bae54aad srcrev_update: use renamed variable
oe-core renamed its internal variable, set both old and new variable
to work with old and new versions of oe-core.

Change-Id: I90293c6d37c3ca5d5d82d67e1269afa2b12f1d89
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 44990089fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-19 11:10:45 +00:00
Qt Submodule Update Bot
65e670e290 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I4dc32693af9f47151cea4ce8c95773b40b76d21e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-18 15:44:03 +00:00
Martin Jansa
68c01dd9a3 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-17 18:19:15 +00:00
Qt Submodule Update Bot
7adb030da6 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I04a607c7271718d590117a2360851401d6854301
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-14 02:47:25 +00:00
Ari Parkkila
67e241179c Add python3-appdirs to native and nativesdk builds
Fixes: QTBUG-112774
Change-Id: Ic8eca3cc0d6de2262581ea2db804f510a0c6f8af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 88ffeb7c99)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-13 14:22:32 +00:00
Samuli Piippo
514cf00d03 Make python-html5lib optional
Add python-html5lib to the SDK only if openembedded layer is available.

Change-Id: I381382c355e2834c2aadd5976e59007be0549ac9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e54ee19bfa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-27 17:46:42 +00:00
Samuli Piippo
dba8882597 qtserialbus: socketcan need openembedded layer
Don't enable socketcan PACKAGECONFIG unless openembedded layer
is available.

Change-Id: I54aa0d70014448bf5425ef7a49f9a32e27ba7807
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a4bf9c64e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-27 17:46:36 +00:00
Andrej Valek
b2e56e7dc7 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
43edb13d16 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.

Change-Id: Ic80b42d71037637298c805a60f20c8737f00b026
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a55215df48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-22 14:37:34 +00:00
Samuli Piippo
c366b27397 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-21 09:24:47 +00:00
Qt Submodule Update Bot
d174e02a18 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I17ae80152db235df798478b2c61cba6ad5ed3d6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-21 09:24:47 +00:00
Samuli Piippo
0e26198d2b qtgrpc: add dependency to declarative for examples
Additional examples depend on QtQuick.

Change-Id: I0373dc10d072f75c4f099131aa9b6d7876e17808
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e44a806e40)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-20 22:02:20 +00:00
Michal Klocek
a860bdf4bd Add python3-html5lib to sdk
This is required by qtwebenigne to be compiled with sdk.

Change-Id: I0053ca241c1b60b60edbc99f0830434a1d95f92d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit aec03e788c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-15 18:16:59 +00:00
Samuli Piippo
db80d4d2c7 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
Ari Parkkila
f4e522b699 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
Change-Id: I4e6b2c27ad851666b1f25d472932b601442d2fe6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ea4489ce49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-07 14:02:35 +00:00
Qt Submodule Update Bot
8dc7f81130 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idb1b51c38b8f5a7173b0eb0afb133aea31dabe31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-07 06:51:01 +00:00
Mikko Gronoff
6ff0db5c6f Bump QT_VERSION to 6.5.1
Change-Id: Ie8b3f9af542fbabeed8c29e54e8008d39bf5afc5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-03 09:43:18 +02:00
Qt Submodule Update Bot
637a3a6a4e Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I2ed2257ab85ffd1fbf002b13c2e88f1212b6d8ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 19:15:18 +00:00
Qt Submodule Update Bot
0d816d3fcb Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ib7fa188dd9c612e547aa47e23743a818427c2e5f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-01 19:55:41 +00:00
Qt Submodule Update Bot
9b749150e3 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I8d11e76211de2aed8296bc191725d1e40b442d56
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-28 13:28:12 +00:00
Qt Submodule Update Bot
03a5bb2d00 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Idbf4f0060430724424d7dd3c3d25779b9c069077
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-27 13:44:33 +00:00
Samuli Piippo
d0876583b1 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.

Change-Id: I1d9f8916508ddf11c1ef2908543d77e12acdf0bc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4862c58253)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-27 13:11:17 +00:00
Samuli Piippo
bd25d1ef34 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-27 13:11:08 +00:00
Qt Submodule Update Bot
41eeefb86a Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Id5d6c834e9bbabba6a409ccc4d565af4b7965774
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-20 12:36:44 +00:00
Samuli Piippo
60fc617037 qtbase: refresh patch
Fuzz detected.

Pick-to: dev
Change-Id: I09e53fe47a8e01384fce9bdf5960f3c4f1f51093
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-02-20 12:36:43 +00:00
Samuli Piippo
590d6893cd 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
Samuli Piippo
a1fb7ce5fc Revert "qtbase: fix build with older CMake"
This reverts commit 3a33e963bd.
Commit is merged upstream.

Change-Id: Icc9f0aca9bc22f90f528775612c9c2e549e490d3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-09 13:02:11 +00:00
Samuli Piippo
f1b6dce411 qttools: update revision
Needed to fix example build.

Change-Id: If3bb146430c357876b9f26598b55a9359b5fa076
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-09 13:02:00 +00:00
Qt Submodule Update Bot
d443eea7fe Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ic912c0e77e01f10bb02e2782a7785114d883332e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-09 13:01:55 +00:00
Samuli Piippo
cf3686848e protobuf: remove upstreamed fix
The protobuf fix is now available in meta-openembedded.

Change-Id: I83e911b64cf35767af22b76c19ea27ce818e300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8454efd1ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-31 17:37:23 +00:00
Samuli Piippo
543604244d 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.

Change-Id: I85b310608772884134a63138781aad9fa1220110
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b1db9ca0d5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-31 12:50:22 +00:00
Samuli Piippo
c4561ed2f0 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:21 +00:00
Samuli Piippo
a9d51b54a8 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.

Change-Id: I37a90e1a79d64a8154ab6fb510a9d8d5cf6d26c5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 8c17fb058a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-27 17:44:23 +00:00
Samuli Piippo
b6928361f7 qttranslations: add catalogs.json into dev package
A new catalogs.json file is created for deployment purposes.
Include it a dev package.

Pick-to: dev
Change-Id: I2e28c9ee886d8f09a79c5f13cf38e47cb2dc81f0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-25 08:08:42 +00:00
Samuli Piippo
3a33e963bd qtbase: fix build with older CMake
Include fix for older CMake 3.16 used in dunfell.

Change-Id: Ie9a735d1212d8ef2156f36178bda239094c1fbe7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-25 08:08:35 +00:00
Qt Submodule Update Bot
c4f00fb55e Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: I750310b1c9ad4acfd7d518caf5cac539cfa150fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-25 08:08:27 +00:00
Samuli Piippo
deda6132c1 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.

Change-Id: Ib298a0916d781fd11c0e4ad53dc642734d60ca3b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 9ad2cce88e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:43 +00:00
Samuli Piippo
b8dfd94b54 qtbase: fix scripts from libexec dir
Some of the scripts were moved to libexec dir, which must also
be patched.

Change-Id: I2099f61f8dbdf8d4eed010de146f18146585a40e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a11e036440)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:43 +00:00
Samuli Piippo
3a88a30eaa 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
Samuli Piippo
12e4e29e4a 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.

Change-Id: I751737fd7adaeeceb58e889765435750f3c3f274
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit cf715572cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-19 09:57:30 +00:00
Samuli Piippo
de89ed0547 qtwebengine: update chromium revision
Task-number: QTBUG-110272
Change-Id: Ic031c857483777deeacbd65f7beaf7c007fccb08
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-17 14:24:29 +00:00
Samuli Piippo
6b923c4803 Add recipe for QtInsightTracker
QtInsightTracker is a commercial-only module.

Task-number: ANALYTICS-237
Task-number: QTBUG-108568
Change-Id: I30412dec8552898b76865402c2e2ccfcae8d1904
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 56710e8724)
2023-01-17 08:31:11 +00:00
Mikko Gronoff
f4c32a89eb webengine: update chromium branch
Webengine updated to chromium 108 branch.

Change-Id: Ia67581eee6d0963b77bd4d60724d2845d03f94bd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-16 09:06:55 +02:00
Qt Submodule Update Bot
9ec574ff57 Update submodule refs on '6.5' in yocto/meta-qt6
Change-Id: Ie6699706e7119356de41697937afef385a3e5cbd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-16 07:06:49 +00:00
Samuli Piippo
40a6e8b15f 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-11 19:38:56 +00:00