Commit Graph

696 Commits

Author SHA1 Message Date
Samuli Piippo
7941caa131 pytest-qt: upgrade to latest version
Update python3-pytest-qt to version 4.2.0.

Pick-to: 6.7 6.6
Change-Id: Ib3cd21aaae59be4dbc02552c665e4c4f585e7cb2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-19 11:55:30 +00:00
Mikko Gronoff
3bed409064 Bump version to 6.8.0
Change-Id: I40a79a3f1749a2a8647aa963d881b6dacf307d26
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-12-17 15:38:59 +02:00
Qt Submodule Update Bot
ef6320bb26 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I7d7d7fd31748e2e73cf38c97f5370a7022382861
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-16 03:13:40 +00:00
Qt Submodule Update Bot
1e336d2c9c Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ida6d64c059f16f6b8d7be484406110ddedfecee1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-14 12:21:12 +00:00
Samuli Piippo
e56bb1b822 qtwebengine: update to 118-based
Update QtWebEngine and QtPdf to use 118-based chromium.

Change-Id: I9a09b33156240ac8da850cf60984ba1986c5f474
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4b105e589b)
2023-12-14 12:21:11 +00:00
Samuli Piippo
a6c21eed21 srcrev_update: support for all recipes
Add variable to find base dir for meta-qt6 and use that in
srcrev-update to support using it in any recipe.

Pick-to: 6.7 6.6
Change-Id: I91960508a8ec96ee6fe7af69046915f048925f62
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-13 14:55:39 +00:00
Samuli Piippo
13ce6ff6bd qttools: use clang if it is available
Use clang from meta-clang if the layer is available. Only tools require
clang, so skip target build as tools are not enabled by default.
Cannot use clang with mingw32 as it doesn't have python support.

Pick-to: 6.7 6.6
Change-Id: I1c43a816f81eeb5cdd28c5d05316e9e137514f58
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-13 14:55:33 +00:00
Samuli Piippo
0ed7c766db qtinterfaceframework: fix packaging error
Packaging has errors:
  Multiple shlib providers for libInstrumentCluster.so.
This lib is in examples and needs to be marked as a private lib.

Pick-to: 6.7
Change-Id: I38130d76d8749ca10aeeff0bb2eac9711a800b53
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-13 14:55:26 +00:00
Samuli Piippo
7b5020d1a1 qtinterfaceframework: remove simulation and reference api
The simulation and reference api implementations were removed from
qtinterfaceframework module.

Change-Id: Iff7bcd4591d0e8955d2a96aa8fe31f2af103a0cb
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2023-12-04 17:35:22 +00:00
Qt Submodule Update Bot
e3e5eaa498 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I7ed1ff8df77ef67d698e71588459ff405cf7d244
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-04 17:35:21 +00:00
Qt Submodule Update Bot
273c409085 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I62853d541f9f335981cdf1433ee0c430bdc1b039
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-02 06:43:08 +00:00
Qt Submodule Update Bot
92d4ab3918 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I0af22df0e3ee517babe4124eb29e1d419b93b56b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-01 05:13:11 +00:00
Samuli Piippo
0f13864a9b qtdeclarative: add dependency to qtsvg
New tool, svgtoqml, was added to qtdeclarative that depends on QtSvg.
Make qtsvg buildable for native and nativesdk, and add dependency to it.

Change-Id: I1778842f4562017580f148267a2a2390098c20f2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-01 05:13:10 +00:00
Samuli Piippo
5cfc35d4f0 qtbase: fix QLibraryInfo prefix with usrmerge
If Qt is configured to use 'relocatable' feature, QLibraryInfo will
at runtime try to determine its prefix path. If distro is using
usrmerge, Qt libraries are found from '/lib' before '/usr/lib' causing
Qt to use wrong prefix '/' when Qt was configure with '/usr' prefix.

With Yocto builds, we have no need for the relocatable feature,
disable it to avoid issues in usrmerge distros.

Pick-to: 6.6 6.5
Fixes: QTBUG-119140
Change-Id: Ied2ca04b5d46cff5d4bed1c456e95235156c58f0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-11-30 07:06:11 +00:00
Qt Submodule Update Bot
941adb0bd2 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I760ee01c356a4f9b2c146f575c34e2a9bbe7441e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-25 04:56:21 +00:00
Qt Submodule Update Bot
689f70bffb Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I59804998a1245d3b1a2356513a01d23d17d8a685
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-22 11:32:39 +00:00
Qt Submodule Update Bot
a9ff2a811f Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I489a359a1765d4ead0badd567a38b1cbe25dbceb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-20 18:32:16 +00:00
Samuli Piippo
ac54355589 qt3d: remove upstreamed patch
Assimp is now updated to version that has the patch applied.

Change-Id: Ib33974d44ada36f79d73f81689fb91cd6d94a355
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:06:22 +00:00
Qt Submodule Update Bot
0ba1a38914 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Idb63eeed28e3b11389a425e3b0508a9a4334bcb3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-17 09:06:14 +00:00
Samuli Piippo
5658c882ff coin: add test config for build ptest image
Include file that can be used to create test image with
all Qt ptest packages included.

Change-Id: I9f618a3d380b4d0f3bb4d650d114f29aeffc857c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:05:50 +00:00
Samuli Piippo
3dc62ec47b qmlcompiler: enable ptest
Issues resolved and the tests can be enabled.

Pick-to: 6.6 6.5
Change-Id: I8c8c0ad8b9864589ed4248a9157159bb55d26407
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:05:42 +00:00
Samuli Piippo
c5d2c93ba1 qtwebengine: enable ptest
Issues resolved and the tests can be enabled.

Pick-to: 6.6 6.5
Change-Id: I052259b23b9836e84faa07be9123078b5bdb7d2d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:05:35 +00:00
Samuli Piippo
51bd35a9f9 qtconnectivity: enable ptest
Issues resolved and the tests can be enabled.

Pick-to: 6.6 6.5
Change-Id: Ia50bf85c006fef63a65762bd37204f86299e7bf9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:05:27 +00:00
Samuli Piippo
097cfd9d54 ptest: better ptest support
Make run-ptest script correctly log passed and failed tests.
Set env variables to make more tests pass correctly.

Pick-to: 6.6 6.5
Change-Id: I3c23a0a093b396df6b88aedc51a15a871f1ba9e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-17 09:05:20 +00:00
Samuli Piippo
44f08284c7 Revert "protobuf: add workaround for qtgrpc"
This reverts commit f00bd7134e.
Fix has been merged to meta-openembedded

Fixes: QTBUG-118868
Pick-to: 6.6 6.5
Change-Id: I2d5f03d49e48605dad2bbc0b0c6885fe3f73ef75
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-15 10:05:47 +00:00
Samuli Piippo
550194a77a coin: add CI build for nanbield
Add separate build for nanbield. Update readme for the supported
branches. Next Yocto release (scarthgap) will be LTS relase,
aim to support it from Qt 6.5 upwards.

Pick-to: 6.6 6.5
Change-Id: I37141b4d2a93fc6b276de906dbb7ba60b2733c41
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-14 07:52:47 +00:00
Qt Submodule Update Bot
c7cfbb3e9d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I787fdc259f4e234676079121b8ed988adbcad94d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-13 22:33:33 +00:00
Qt Submodule Update Bot
b6a015f0a5 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ibebe15349ae4605a9d9326d0bf33ad28e737c7b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-13 15:52:52 +00:00
Kai Kang
2f7cd39ed9 qtgrpc: update to latest revision to fix build failure
Update qtgrpc to latest revision. It reverts

"Require protobuf 3.12 as the minimal supported version"

which causes qtgrpc-native link error.

Change-Id: I186b3dd42460f623e3dd210f2e9bb33fbf120554
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-11-09 16:11:23 +08:00
Samuli Piippo
f00bd7134e protobuf: add workaround for qtgrpc
If protoc is enabled for the build, recipes using protobuf will
fail when protoc is not available in the recipe sysroot:

|   The imported target "protobuf::protoc" references the file
|
|      ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/protoc-3.21.5.0"
|
|   but this file does not exist.  Possible reasons include:
|
|   * The file was deleted, renamed, or moved to another location.
|
|   * An install or uninstall procedure did not complete successfully.
|
|   * The installation package was faulty and contained
|
|      ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/cmake/protobuf/protobuf-targets.cmake"
|
|   but not all the files it references.

Use SYSROOT_DIRS to stage the binary to sysroot so it's always
available for other recipes.

Pick-to: 6.6 6.5
Change-Id: I588c54d0459dbb88bc080e8bf55902e851a0a1d8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-11-06 14:06:55 +00:00
Michal Klocek
4a78cb1c2d Remove old patches from qtwebengine
The workaround for long rsp file is an old patch
from qt5 times, which should not be needed in qt6
as used toolchains are in-source, therefore created
toolchain labels and later rsp files should not embedded
absolute paths, but simply use 'build/toolchain/yocto'
as this is a location of yocto toochain with-in source
tree.

The second patch is fixed in 112-based in 29354c7c7de.

Task-number: QTBUG-59769
Change-Id: I94a610c4562463f5de3f8bbb29915e05cf40e640
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit bdbb28f362)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-20 05:44:59 +00:00
Qt Submodule Update Bot
8a047bd3be Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie5705beb5bf5691f6fdc19bd048268ab7c3a294c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-20 05:44:58 +00:00
Samuli Piippo
511db28072 Workaround too eager packagegroup sanity check
Amend 95fa269ffa and add same workaround
also for the commercial packagegroup to prevent QA error: "An allarch
packagegroup shouldn't depend on packages which are dynamically renamed."

Pick-to: 6.6 6.5
Change-Id: I6eaee9aa74681cfb70fb738d966cd7381f4bcdb0
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2023-10-19 05:25:43 +00:00
Samuli Piippo
bc1179c5a3 Remove checks for required meta layers
Since meta-openembedded and meta-python are now dependencies,
we can simplify some of the recipes that were checking if the
layers were available. Now always use the features available
from those layers.

Pick-to: 6.6 6.5
Change-Id: Ia70658e0c64b916c9d36ad9aca4c40172b86b5b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-18 12:39:59 +00:00
Martin Jansa
2713f52a6f layer.conf: fix LAYERDEPENDS_qt6-layer
* qtgrpc depends on protobuf from meta-oe:

  ERROR: Nothing PROVIDES 'protobuf-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtgrpc_git.bb DEPENDS on or otherwise requires it). Close matches:
    popt-native
    xcb-proto-native
    xorgproto-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtgrpc', 'protobuf-native']

* and qtpdf, qtwebengine depend python3-html5lib-native on from meta-python:

  ERROR: Nothing PROVIDES 'python3-html5lib-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtpdf_git.bb, /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtwebengine_git.bb DEPENDS on or otherwise requires it). Close matches:
    python3-toml-native
    python3-tomli-native
    python3-urllib3-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtpdf', 'python3-html5lib-native']

Pick-to: 6.6 6.5
Change-Id: I616e03e3a259e532e4ccd6ec87a2975c063837fc
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-18 12:39:51 +00:00
Samuli Piippo
3df4dfb2e2 qtgraphs: remove opengl requirement
QtGraphs no longer requires opengl to work.

Pick-to: 6.6
Change-Id: I03e166dc2d4265b74156f17d56ba4e20bc180bfd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-17 11:45:51 +00:00
Qt Submodule Update Bot
6ec6b62dad Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I763565f0920efb1bf17cd424334098ab08a03685
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-12 16:58:36 +00:00
Samuli Piippo
4b5f7744d4 qtbase: add PACKAGECONFIG for egldevice platform plugin
The eglfs EglDevice platform plugin is used only in NVIDIA boards.
Add separate PACKAGECONFIG so it can be disabled by default,
otherwise it gets built whenever kms is enabled.

Pick-to: 6.6 6.5
Change-Id: I98b56f4ff1c9dc04a0c0df3ab51f908608c52fbd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-12 12:03:32 +00:00
Qt Submodule Update Bot
b091031439 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia8a29b697788adefe484610b307f061639bcc518
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-05 22:40:08 +00:00
Qt Submodule Update Bot
080d5982c0 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ib7afe389db2d60529d36fe2b41f51c299e3074fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 13:42:23 +00:00
Samuli Piippo
32e8ea4dce readme: remove notes about webengine testing
Old Yocto releases are no longer supported, so the note about
testing for old releases is no longer relevant.

Change-Id: I49808cd5b2b95ebcb6012b836c7df447d1782475
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-04 13:08:43 +03:00
Samuli Piippo
234a3be0a8 qtapplicationmanager: remove unneeded CFLAGS
Use of execinfo has been fixed in the module, no need
to add flags here.

Change-Id: I65bbb6e304c59d345e2425f5e9da7f8006479925
Reviewed-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-04 10:08:36 +00:00
Samuli Piippo
9566cdd31e qtopcua: add support for native and nativesdk
Starting with Qt 6.7, Qt OPC UA comes with a data type generator.
Add support for native and nativesdk builds.

Change-Id: Ia840870417e39862f04f02ba8da868a5659acd14
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-10-03 07:43:31 +00:00
Qt Submodule Update Bot
b0041aef2c Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I46cff826d8e052ad53a18a6ccdf05fe241b690dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-03 07:43:06 +00:00
Andreas Cord-Landwehr
806a39f3ac qtbase: add at-spi2-core as dependency for accessibility option
Without at-spi2-core the SPI bridge API is not being built.

Pick-to: 6.6 6.5
Change-Id: I49232f933b96597fba721473dd7dcf894d60d9cd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-02 16:37:18 +02:00
Samuli Piippo
0f91287175 readme: Add link to bug tracker
Pick-to: 6.6 6.5
Change-Id: Ida7529550d0ef2d816f86d82c1feaa581e0b624f
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
2023-10-02 11:38:19 +03:00
Samuli Piippo
98eb819c18 qtmultimedia: enable ffmpeg only if its license is accepted
QtMultimedia can use FFmpeg, but it has has somewhat problematic license
and user must accept it before it can be built. Enable FFmpeg backend
by default only if the license has been accepted in LICENSE_FLAGS_ACCEPTED.

Pick-to: 6.6 6.5
Change-Id: If23ee18fa7ac7f92f58bf9d09d8e96aedd08b625
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
2023-10-02 11:38:09 +03:00
Qt Submodule Update Bot
96c3988dab Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia3fe4693cc260c9b8470a00a9f7c6dbc30025258
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 11:45:41 +00:00
Samuli Piippo
12b1d381ea Revert "qtbase: fix build with kirkstone"
This reverts commit fd946afc0a.
Fix was merged in qtbase.

Change-Id: I16c05ad1f681a8a92b83c2bad6aa69de8ab2e35f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-09-26 13:53:05 +00:00
Qt Submodule Update Bot
add471f503 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie43409b68ac47a4f970b2f812a0b14580d60ea4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-25 13:06:09 +00:00