Commit Graph

719 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
185cdd84e1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I11f4603899302ab0556a18ac10f279050c21a8bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-26 07:29:04 +00:00
Qt Submodule Update Bot
71e791ff49 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I19ee780dea3f8b000f603af0e7996589945e70d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-20 04:06:37 +00:00
Samuli Piippo
82fac6f29a qtquick3d: add workaround for test build failure
The OpenXR feature does not work correctly with the
ptest build, add workaround to make it pass.

Task-number: QTBUG-122205
Change-Id: I6237549f2e0098f6796e8b7f5abd59e9dd8fd2c5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-13 10:31:43 +00:00
Qt Submodule Update Bot
f3ca5bd39b Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ibde04e05dca8ac939b53afc4ade084cd99383530
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-13 10:31:28 +00:00
Samuli Piippo
3c24d5dfd2 layer.conf: update LAYERSERIES_COMPAT for scarthgap
oe-core as switched to scarthgap

Pick-to: 6.7 6.6 6.5
Change-Id: Ica326b8be4a23a5b6a52667a98740720185a6f73
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-12 09:11:01 +00:00
Samuli Piippo
b8a440f310 qtbase: prefer system png
Update PACKAGECONFIG[png] to make sure we use the system libpng
as expected.

Fixes: QTBUG-121795
Pick-to: 6.7 6.6 6.5
Change-Id: I051a9a40a9a7bfd001b77c51db9eab2b19147efb
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-02-12 09:10:53 +00:00
Samuli Piippo
a18047ef52 packagegroup: add Qt modules only on supported archs
QtQuick3dPhysics, QtPdf and QtWebengine have limited
architecture support.

Pick-to: 6.7 6.6 6.5
Change-Id: Icf1d7628de5365825c79030462f019b15d9ae9a0
Reviewed-by: Alex Bu <alex.bu@qt.io>
2024-02-12 09:10:47 +00:00
Kai Kang
635948ee8a qtdoc: only add qtpdf to DEPENDS for machines in COMPATIBLE_MACHINE
qtpdf includes chromium-gn.inc which set COMPATIBLE_MACHINE. For arm, it
is only compatible with armv6 armv7a and armv7ve. So only add to DEPENDS
for these machines.

Pick-to: 6.7
Change-Id: Id5601f9e6ebd7427431115f556b9982645e9c1c4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-02-06 07:11:43 +00:00
Khem Raj
88c7940a31 qtwebengine: Remove setting --target option with yocto
This option is not needed to be set with OE when using clang because OE
passes correct tuple which is recognised by OE based distros correctly.
Otherwise search paths for C runtime files goes awry and we get cryptic
linking failures like

ld.lld: error: cannot open crtbeginS.o: No such file or directory
ld.lld: error: cannot open crtendS.o: No such file or directory
aarch64-yoe-linux-clang++: error: linker command failed with exit code 1 (use -v to see invocation)

Pick-to: 6.7
Change-Id: Id445fb44adc3b9603109fe4763bd6344370cffff
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-06 07:11:21 +00:00
Samuli Piippo
a36b5a05b4 libwebp: add workaround for native build
QtWebengine requires libwebp-native, but support for it was added
in nanbield. To support kirkstone builds, add bbappend to enable
the native builds.

Pick-to: 6.7
Change-Id: Id94addf24f19552b6fb6fc074e0a5c51199b877f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-06 07:11:09 +00:00
Khem Raj
bc941d6f9a qtwebengine: Add missing dependency on native libevent.pc
Latest qtwebengine does the right thing by not looking into build host's
rootfs but this means we need to add libevent to native sysroot to meet
this dependency, otherwise gn fails to find it and build fails like
below

Fixes:

    |   -- GN FAILED
    |-
    |   ERROR at //build/config/linux/pkg_config.gni:104:17
    |   (//build/toolchain/yocto:yocto_native): Script returned non-zero exit code.
    |-
    |       pkgresult = exec_script(pkg_config_script, args, "value")
    |                   ^----------
    |-
    |   Current dir:
    |   /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/qtwebengine/6.6.2/build/src/core/Release/aarch64/
    |-
    |-
    |   Command:
    |   /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/qtwebengine/6.6.2/recipe-sysroot-native/usr/bin/python3-native/python3
    |   /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/qtwebengine/6.6.2/git/src/3rdparty/chromium/build/config/linux/pkg-config.py
    |   -p
    |   /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/qtwebengine/6.6.2/recipe-sysroot-native/usr/bin/pkg-config-native
    |   libevent
    |-
    |   Returned 1.
    |-
    |   stderr:
    |-
    |-
    |-
    |   Package libevent was not found in the pkg-config search path.
    |-
    |   Perhaps you should add the directory containing `libevent.pc'
    |-
    |   to the PKG_CONFIG_PATH environment variable
    |-
    |   No package 'libevent' found
    |-
    |   Could not run pkg-config.

Pick-to: 6.7
Change-Id: I66d8806be14d2d4d57dca2d93688d5b58e0e1cb6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-06 07:11:04 +00:00
Khem Raj
5daa561cad qtwebengine: Pass OE specific pkg-config-native for host pkg-config
chromium has a way to use right pkg-config for in-tree hosttools which
are built and used during cross build of qtwebengine, since OE
pkg-config environment is set for detecting .pc files from sysroot,it
ends up reading wrong pkg-config files for host pieces and adds
-L<sysroot>/usr/lib to linker cmdline for hosttools too, this goes by
fine with gnu BFD linker since it ignores linker script files like
<sysroot>/usr/lib/libc.so, but when we use LLD linker, it ends up in
error, because it tries to process the content of libc.so which have
target absolute paths for ldso etc. /usr/lib/ld-linux-aarch64.so.1
LLD tries to open these files and ofcouse can't find them because
they are only found in target sysroot.

The underlying problem is that we need to be explicit about pkg-config
which is  thusly implemented by this patch. This fixes build with
clang+lld and link times for qtwebegine is reduced by 26% in my case.

Pick-to: 6.7
Change-Id: Id091200444eb97d4b44d984888a8aa16b75ff9d7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-06 07:10:58 +00:00
Samuli Piippo
8d3758ce9e packagegroup: fix warning caused by inherit_defer
Yocto scarthgap is now using inherit_defer which causes allarch
to be inherited last, when nativesdk wants to always be the last one.
Workaround this by setting PACKAGE_ARCH to empty, which causes the
allarch inherit to be skipped. PACKAGE_ARCH will still end up being
the same value, as packagegroup will set it correctly.

Fixes QA Issue: nativesdk-packagegroup-qt6-toolchain-host: native/nativesdk
class is not inherited last, this can result in unexpected behaviour.

Pick-to: 6.7 6.6 6.5
Change-Id: I0457a62333d88b14c3330e3349f585dc6c3eec35
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-01-31 09:59:45 +00:00
Samuli Piippo
564f560b50 coin: update build targets
Add 6.7 to test matrix and reshulffle the build targets.
mickledore is EOL, drop it from active testing.

Pick-to: 6.7
Change-Id: Ia371a06c10b3f66956227d5d7c0357cb83097f87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-01-30 08:13:20 +02:00
Samuli Piippo
c0b9c32fbc ptest: skip non-existing tests
ctest might list tests that don't have executable, such as
QMLTESTs, that are run with qmltestrunner. Skip these tests.

Pick-to: 6.7 6.6
Fixes: WEBOSCI-62
Change-Id: If8e3ce657d86469b8a83a05146e6698b8c5452d3
Reviewed-by: Alex Bu <alex.bu@qt.io>
2024-01-29 12:49:33 +00:00
Qt Submodule Update Bot
20596ba439 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I9888d204cb4651cec4f65f0d87dd5c3bc263deef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-29 08:06:12 +00:00
Samuli Piippo
d457a6e717 Add recipe for QtDoc
QtDoc does not have any libraries, but it provides set of nicer
demos.

Pick-to: 6.7
Change-Id: I17c229c0a37f6e86bef5914cf5a2824fadfe73cd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-01-26 05:27:15 +00:00
Qt Submodule Update Bot
8fb854dcdd Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I93f866be051314b451d7f63b0e786d69b7a337f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-17 08:15:52 +00:00
Qt Submodule Update Bot
26e4c0e353 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I52e5aa542930acb8f5010d0cbfba3aa4ed93d959
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-16 14:17:49 +00:00
Mikko Gronoff
7e80a1296c webengine: update patch
Change-Id: I2c9df3bde7b0c6776cfd3a32093047fad1bd7256
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-12-27 11:06:41 +02:00
Qt Submodule Update Bot
04f8e6b271 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I3d172f56569b505b9f47c348cec42d3d35e9e6ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-27 09:06:34 +00:00
Samuli Piippo
5e20524950 ptest: better handling for test list
Use ctest to find all tests to run as not all of them start with
a tst_ prefix. This is done by parsing the json output of ctest.
Add all test sources to the package as there are data files in
some tests that are needed.

Remove qmake support, since it's not supported when building
Qt module.

QtDeviceUtilities had includes in wrong order, so ptest runner was
never added to the package.

Task-number: QTBUG-118680
Pick-to: 6.7 6.6
Change-Id: I6397cb1fd331941a3425bf627676b6387ab8bb8d
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-12-21 08:05:48 +00:00
Samuli Piippo
f56893e8c1 Add srcrev for QtDoc
QtDoc provides more demos.

Pick-to: 6.7
Change-Id: I6e3cfa51d053b3f3b775acb964cf0d47cfcec09f
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-20 08:49:25 +00:00
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