Commit Graph

394 Commits

Author SHA1 Message Date
Samuli Piippo
73927c6db3 qtwebengine: skip host build
QtWebEngine normally does a host build before the actual
cross-compilation build. We can skip that since during the
cross-compilation, the target binaries are run using QEMU
instead of ones from the host build.

Fixes: QTBUG-102378
Pick-to: 6.3 6.2
Change-Id: I586a68641b48678933ed91a742235c6b22f1d109
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-04-08 09:59:48 +00:00
Samuli Piippo
cba320e7bf qtserialbus: add tools to the image
QtSerialBus has canbusutil runtime tool that is useful to have
in the device.

Change-Id: Ib751cbb153d122ef6e2a58e3f7a455a58d668265
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-04-08 09:59:41 +00:00
Samuli Piippo
9334145f37 Stage all tools to sysroot
The compile time and runtime tools are referenced by CMake files
and if missing from sysroot, it can cause errors suchs as:

| The imported target "Qt6::canbusutil" references the file
|
| "/home/mak/yocto-raspberrypi-latest/build/tmp/work/cortexa53-poky-linux/smartcore/2.2+gitAUTOINC+3970c5b703-r0/recipe-sysroot/usr/bin/canbusutil"
|
| but this file does not exist.

Stage all files in bin and libexec dirs to make sure cmake builds work,
even though the binaries are not actually used during the build.

Pick-to: 6.3 6.2
Fixes: QTBUG-102370
Fixes: QTBUG-97707
Change-Id: I3326e7b8f970952f6d18591204cb78e5a0defcf5
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-04-08 09:59:34 +00:00
Samuli Piippo
9ee589de19 coin: use shared Hash Equivalence server
Use shared Hash Equivalence server together with sstate cache.
The Hash Equivalence server can further improve sstate re-use.

Pick-to: 6.3 6.2
Change-Id: I037b565344942cf99c4992e4ff9769fd47d9c77d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-07 10:55:04 +00:00
Samuli Piippo
269c0e836c python3-antlr4-runtime: use correct recipe name
Pick-to: 6.3 6.2
Change-Id: Ied805f6349eaaaa2bdff82712a5b24ca8817e02f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-07 13:54:54 +03:00
Samuli Piippo
76e4f4c875 qtwebengine: webrtc-pipewire depends on libgbm
Add libgbm dependency to webrtc-pipewire PACKAGECONFIG and
remove it from the defaults, since not all graphics stacks
have it.

Change-Id: Ibb8033514d8ed14674d6b475b26f84f14aefca18
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-07 10:54:44 +00:00
Samuli Piippo
7a4cbf2995 Revert "qtquickdesigner-components: lower minimum CMake version"
This reverts commit bab800db57.
Fix has been merged to qtquickdesigner-components.

Pick-to: 6.3 6.2
Change-Id: I1ef7d09e3d1c9517aa5c7abbf376cb9bb9422009
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-07 13:54:38 +03:00
Samuli Piippo
5951f10548 Revert "qtquick3d: fix native build"
This reverts commit 1f8fa2d766.
Fix has been merged into qtquick3d.

Change-Id: I6cc9dda5bf1c53cf969bd859e0bb03ef1c40ae84
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-07 13:54:33 +03:00
Qt Submodule Update Bot
d9488d5409 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I6a5e7bd067c6970aec82987c0f1f7706e6cdb46d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-07 10:54:26 +00:00
Samuli Piippo
312d7185d8 qt6: make configure more verbose
Qt configure has lowered its verbose when not using developer-build.
Increase the verbose level to have the configure summary of the
Qt module back into the logs.

Pick-to: 6.3 6.2
Change-Id: If742b68353fe6f0614bf4be8f355cfc24f9a42f3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:46 +00:00
Samuli Piippo
1f8fa2d766 qtquick3d: fix native build
Change-Id: I8909dc26c1b4f63590bed794bd596b34c05cf363
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:39 +00:00
Samuli Piippo
bab800db57 qtquickdesigner-components: lower minimum CMake version
Dunfell still has CMake 3.16, which is the default minimum version
for Qt. Use it for qtquickdesigner-componets as well.

Pick-to: 6.3 6.2
Change-Id: I07c0c35dfc589bae4fc9d47e4ec31ef27042454d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:32 +00:00
Samuli Piippo
e8102f036a qtquickdesigner-component: switch to CMake build
Pick-to: 6.3 6.2
Change-Id: I464f6cdedf02185876a57f4cafad47d5f60f10b4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:25 +00:00
Samuli Piippo
65972077eb qtwebengine: move to 98-based chromium
Change-Id: Ia3a13200ddee60e3f1d5ab94b1994a21563ab33a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:18 +00:00
Samuli Piippo
0f598c3c14 qtserialbus: use PACKAGECONFIGs
Use PACKAGECONFIGs for modbus and socketcan supports. This adds
needed runtime dependency to libsocketcan.

Pick-to: 6.3 6.2
Fixes: QTBUG-102197
Change-Id: I0b0aebfa3f9fd896e0307415c54efb9fc7f1b93a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-04-05 08:14:06 +00:00
Samuli Piippo
b24db734ac qtserialbus: remove native and nativesdk support
The tool provided by qtserialbus is a runtime tool and there no needed
to support either native or nativesdk builds.

Pick-to: 6.3 6.2
Change-Id: If1292680ec8f9afd1085b9a12b1976087cafe71f
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-04-05 08:14:02 +00:00
Samuli Piippo
3fdebdda65 qmlcompiler: remove merged patch
Change-Id: If3583ef24a7fb8aff973432fdc4119e4b538cf3e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-05 11:13:54 +03:00
Samuli Piippo
910ec2e260 qtbase: update license checksum
Pick-to: 6.3 6.2
Change-Id: If4c6822c71e627d973b55f9edad382a4d6088acd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-05 08:13:44 +00:00
Samuli Piippo
90b433994a qtdeclarative: update revision
Update needed for mingw compilations.

Change-Id: Ifc0bf4740296a10816563ba6cfd10bda705fb8d1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:13:34 +00:00
Qt Submodule Update Bot
e075968c08 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ibce642bea874d2c5a9c86d4fbac29b9ec1a48b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-05 08:13:29 +00:00
Jani Heikkinen
2652a4458a Update The-Qt-Company-Commercial
Newest version is 4.4.1 so update it in the git as well

Task-number: QTBUG-101714
Change-Id: Ifd65867cc25abacd37bf1e90c0638bc50ac476b5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 8d84283339)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-24 19:51:55 +00:00
Samuli Piippo
bc0717a20b qtinterfaceframework: remove workaround
Kirkstone has been updated with working nativesdk-python3
builds and qtinterfacewramework can now be included in the SDK.

Pick-to: 6.3 6.3.0 6.2
Change-Id: Ibcaf520688a56f9607db89993aa9ec9e2d667844
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-23 07:06:58 +00:00
Samuli Piippo
c3d4a5722f qtdeclarative: include tools in packagegroup
qtdeclarative-tools has runtime tools, such as qmlscene,
that can be useful in the image.

Pick-to: 6.3 6.3.0 6.2
Change-Id: I359611f8a3e575d8b18b63c4f8a034ad5ab705a1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-22 11:08:30 +02:00
Samuli Piippo
b32b7f2774 qtinterfaceframework: update workaround for kirkstone
Skip qtinterfaceframework also with kirkstone now that master
branch is using kirkstone as DISTRO_CODENAME.

Pick-to: 6.3 6.2
Change-Id: I8ff7c9c3289d4f2c8864c14a6abcf61fe34250a6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-16 08:09:47 +00:00
Samuli Piippo
eaee55e9fe sdk: add bin to PATH
Prepend PATH env with the path to the bin directory in the cmake
toolchain file. This let's CMake to find CMAKE_MAKE_PROGRAM (make or
ninja) without need to specify it explicitly when using the qt-cmake*
helper scripts.

Pick-to: 6.3 6.2
Change-Id: Ic7ce057421395d98158b3ad6e529f30b629bdded
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-16 08:09:39 +00:00
Samuli Piippo
554b947ba4 sdk: support cmake builds on Windows
CMake and Ninja combination does not support changing RPATH on Windows hosts,
even when cross-compiling. Add CMake configuration to workaround this.

Pick-to: 6.3 6.2
Change-Id: I5d82c0a7f91cf81a0b3ed7c0f14aeccc36464f91
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-16 08:09:35 +00:00
Samuli Piippo
3d122c668c qtbase: enable scripts for mingw toolchain
Make sure the qt-cmake* helper scripts get correctly created
for mingw toolchains.

Pick-to: 6.3 6.2
Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-16 08:09:30 +00:00
Samuli Piippo
ab0d93e29e Coin: add static test build
Build Qt staticially with examples enabled but tests disabled.
We don't want to remove ptest from DISTRO_FEATURE, because that
would cause rebuild of most system components as well.

Pick-to: 6.3 6.2
Change-Id: Ic1181d09951ee5d50b08182600f0664b8859afcc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-15 11:19:57 +02:00
Mikko Gronoff
a9011cf6cd qmlcompilerplus: Add pending upstream patch
The latest dev branch submodule update causes
build break in qmlcompilerplus module. Add pending
reviewed upstream patch to fix issue:

"error: invalid initialization of reference of type ‘QQmlJSScope::ConstPtr&’
{aka ‘QDeferredSharedPointer<const QQmlJSScope>&’} from expression of type ‘QQmlJSRegisterContent’"

Change-Id: Id750838347ccd17a2cc6e336375ea6df1e7d14fb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-12 07:50:46 +02:00
Samuli Piippo
a1b6233b65 qtdeclarative: update patch
Change-Id: Ie993de39fa7838c3cec41febaae131fa01b6af0d
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 2d7b5b5572)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-12 05:50:32 +00:00
Samuli Piippo
f4cbbfeb8e qtbase: remove merged patches
Change-Id: I455262b28b964d7933ed2883baac07056540ac87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-12 07:50:17 +02:00
Qt Submodule Update Bot
eb4f03276f Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I24df40dc7f0d3681f7fc428b851779e89143170e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-12 05:49:55 +00:00
Samuli Piippo
a64c978983 Create Conan profile
Generate Conan profiles that can then be used with the SDK.
Task in qtbase generates profile that has all the architecture bits
and configure arguments in place. The profile added in the SDK phase
lets Conan recipes know how to use the SDK with the QT_CONFIGURE_MODULE
environment variable.

Pick-to: 6.3 6.2
Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-10 08:10:47 +02:00
Samuli Piippo
f80f96848d licenses: add SPDX license mapping to old license names
The common license files have been renamed to use SPDX names, but we
still support some older yocto branches that use the old names.
Add mapping to allow building with older yocto version after the
recipes are updated to the new license names. This avoid warnings:
No generic license file exists for: GPL-3.0-only in any provider

Pick-to: 6.3 6.2
Change-Id: Ib93baf9027442e69ab5bce294449bd203d9be2aa
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-06 11:12:17 +00:00
Martin Jansa
d26bf4af06 meta: update license names
* openembedded-core/scripts/contrib/convert-spdx-licenses.py .
  ...
  All files processed with version 0.01

Pick-to: 6.3 6.2
Change-Id: Ife671a597eea9e1567d2b37d0aea25cc0b8e9012
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-06 11:12:13 +00:00
Justin Bronder
365807e1ae python3-pytest-qt: add 4.0.2
Add pytest support for PyQt and PySide applications.  This was merged to
meta-qt5 in https://github.com/meta-qt5/meta-qt5/pull/448.

Change-Id: I9e21ad89f0be1b8d2f488ed6ad80c13719fa6fbd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-06 06:12:05 -05:00
Samuli Piippo
d1ffa135a7 ptest: fix packaging of test data
Use correct path for the test sources and data.

Pick-to: 6.3
Change-Id: I90f14130dce7f3b5ef3ae45dbdd60540c795ba9e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-06 11:11:54 +00:00
Samuli Piippo
6492c16955 srcrev_update: fix update task with latest fetcher
Additional check was added into the bb.fetcher that needs to be
workaround in srcrev_update task. Otherwise task will fail with
error:

Exception: bb.fetch2.FetchError: Fetcher failure: Recipe uses a
floating tag/branch without a fixed SRCREV yet doesn't call
bb.fetch2.get_srcrev() (use SRCPV in PV for OE).

Pick-to: 6.3 6.2
Change-Id: Ib3c2665257c344c312074519a03d96437866cd8d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-04 07:06:21 +00:00
Samuli Piippo
0ef2348d49 sdk: resolve absolute paths in toolchain file at runtime
MinGW toolchain doesn't perform relocation during installation,
so all the absolute path point to the temporary sdk paths.
Use the location of the toolchain file to get the absolute
paths at runtime instead instead of using external SDKPATH
env for it.

Change-Id: I699b2178baf5cc855a57186056341b6c6eefbbf5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-04 07:06:13 +00:00
Samuli Piippo
5cbac6cf35 sdk: rewrite cmake toolchain file without environment variables
The default OEToolchainConfig.cmake uses environment variables
to set all the cmake variables in place. The Qt6Toolchain.cmake
chainloaded the same toolchain file after setting everything to env.

Rewrite the Qt6Toolchain.cmake now to set all the cmake variables
directly without using environment variables or chainloading
the origin OEToolchainConfig.cmake.

This allow better integration to QtCreator that might be used
to modify the compiler flags for projects.

Change-Id: I7c7c42ec17c86f53b62ed557d9b61d5d19abc1e0
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-04 07:05:59 +00:00
Samuli Piippo
ba348447dc qtmultimedia: update PACKAGECONFIGs
QtMultimedia is again using plugins for different backends
and they can be enabled at the same time. Add PACKAGECONFIGs
for ffmpeg and vaapi backends. Remove vivante workaround,
it's no longer needed.

Default still to gstreamer only. The ffmpeg integration is done
to v4.4 and does not work with later versions.

Change-Id: Ica8f46ceca0ef61caa300b3e23269de062575efc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-03 18:53:02 +00:00
Samuli Piippo
ae90e4457e qtbase: fix QHash build for x86
Change-Id: I23453cd41123c02283fc5c2f10e991f0aaa75006
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-03 18:52:50 +00:00
Samuli Piippo
8ff564fb98 qtbase: fix qsimd build for x86
Temporary fix until merged in qtbase.

Change-Id: Ie660b3d19222e48cd3fd2512cc37f51fd07ca475
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-03 18:52:43 +00:00
Mikko Gronoff
20f186a3ce qtwebview: update license & checksums
Change-Id: I061c2c6a2267fea2bb8c613de2da0c33a5059446
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 89ba83fa7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-03 18:52:36 +00:00
Mikko Gronoff
5d2abdfebb qtbase: update license agreement checksum
Change-Id: I76d6a0a4576d3a8430060d42845e4ca4b5fd7219
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit e0436d24f3)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-03 18:52:28 +00:00
Qt Submodule Update Bot
40c87fd58d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie4479184b18f0ff67edb32a56b964e6c23e67753
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-03 18:52:19 +00:00
Samuli Piippo
d36033ca56 layer: use the same priority as the core layer
Some of the python3 recipes we carry are already in meta-python
layer, but not in all the branches that we support. In order to use
the most recent recipe, we need to have same or lower BBFILE_PRIORITY
than meta-python. Depending on the branch, meta-python's priority is
either same or higher than the core layer's priority.

Pick-to: 6.3 6.2 6.2.4
Change-Id: I98c74858c5be69e45a76a45ed10aa1168c614618
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-03 10:53:34 +00:00
Samuli Piippo
3ff5acc752 layers: Bump to use kirkstone
Pick-to: 6.3 6.2
Fixes: QTBUG-101142
Change-Id: I85c5dbbfc10184108514dd01a3255018c0dc3db4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-24 09:36:49 +00:00
Samuli Piippo
2d4825f309 Coin: adapt to variable renaming
In kirkstone, some of the variable have been renamed to
use inclusive language.

Pick-to: 6.3 6.2
Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-24 09:36:41 +00:00
Samuli Piippo
0708a33ea6 Coin: use include files for configuration
Restructure the Coin build configs so that all configurations
are already in .inc files that can be easily included.

Pick-to: 6.3 6.2
Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-24 09:36:33 +00:00