Commit Graph

515 Commits

Author SHA1 Message Date
Samuli Piippo
63ba821b5c sdk: add new class for populating qt6 sdk
Add new class that can be used to create toolchain containing
all available Qt modules.

Pick-to: 6.4 6.2
Change-Id: I84982749ea9093bbbd20f99391b063c4bcaee39f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-11 13:32:46 +00:00
Samuli Piippo
0648a0a4ef CI: tests against langdale
Update CI builds to use langdale instead of honister releases.

Pick-to: 6.4
Change-Id: Ib18be53b6d3308d5e4c5a2269b40ce67a4c352ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-09 13:23:36 +00:00
Samuli Piippo
7731aab502 qtwebengine: add dependency to cups
Printing support needs cups in cases when it's not already enabled
in qtbase.

Pick-to: 6.4 6.4.1 6.2
Change-Id: I5435bdd61b418f91524726571c9acd2cea92c729
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-09 13:23:28 +00:00
Samuli Piippo
4c5d3e2c3c qtbase: enable better image support for native builds
Enable jpeg support for qtbase-native, needed at least by shadergen.
To use system png, zlib needs to be enabled as well.

Pick-to: 6.4 6.2
Change-Id: I0bea658d689fb99596374701b11aa9ce028e882d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-08 08:15:41 +00:00
Samuli Piippo
6ed90874a6 Disable file cache for shadergen
QtQuick3D's shadergen uses cache from user's home directory.
Disable the caching as it can lead to problems with pseudo.

Change-Id: I6b889fe94eb218d803ece49c9e0ca4ec18c3524a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-08 08:15:20 +00:00
Qt Submodule Update Bot
47ec7eaea7 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I8174f5db17b7f9a5837497e71bd05f75d583a0ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-08 08:15:05 +00:00
Mikko Gronoff
676e6da41b webengine: add patch for python 3.11 build issue
yocto master branch updated python to 3.11, resulting
in webengine build error(s):

"File "/home/qt/work/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/qtwebengine/6.4.1-r0/git/src/3rdparty/chromium/tools/grit/grit/util.py", line 214, in ReadFile
with io.open(filename, mode, encoding=encoding) as f:
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ValueError: invalid mode: 'rU'"

Add patch from chromium upstream.

Pick-to: 6.4 6.4.1 6.2
Change-Id: I6308d2acd17a74b20ad6651d59f34e7246dc96ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-11-03 09:16:26 +02:00
Samuli Piippo
e950cff143 Add license mapping for GFDL-1.3-no-invariants-only
Add license mapping for GFDL-1.3-no-invariants-only to use the GFDL-1.3
license file in older Yocto releases. This recudes warnings for missing
generic licenses.

Pick-to: 6.4
Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-10-21 10:04:44 +00:00
Samuli Piippo
6cb5390957 qtbase: add dependency to patchelf
Build now require either patchelf or CMake to 3.21 or newer. To support
older Yocto version, add dependency to patchelf.

Change-Id: Id0ef1787e3da0f302d31a0ab3048155b661b64af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-10-21 06:14:09 +00:00
Qt Submodule Update Bot
c9db653fb7 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia41163b5227a52f5b98b7c88139e507fb86daffe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 06:14:01 +00:00
Samuli Piippo
aa5aa76ef1 qtwebengine: move to 102-based chromium
Latest chromium no longer supports x86 builds.
Enabled spellchecker as build fails without it.

Change-Id: I6f40d48c20a47edbbc958e2f9c25907d05feb5b1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c1441fcabc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 07:19:52 +00:00
Samuli Piippo
f51473e349 qtopcua: update revision
Includes fix for OpenSSL 3.0.

Change-Id: I8c867f90ebc4a3bbea57995c5428ac4ae017e213
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-10-20 07:19:31 +00:00
Samuli Piippo
4e4577a08e qtbase: add dependency to xcb-util-cursor
The XCB support now uses libxcb-cursor instead of Xlib/libXcursor.
The recipe is available in meta-openembedded, which now makes
it a mandatory layer for XCB support.

Task-number: QTBUG-67373
Change-Id: I40a1d100fd06aaeb31b3d4876de0ce6e7d836632
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-10-20 07:19:18 +00:00
Mikko Gronoff
a3d1baf37c qtshadertools: update license checksum
Change-Id: Ied742572ed1f41a5fb0972a8f4b3908558102abe
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-10-20 07:19:08 +00:00
Samuli Piippo
444b6cc7ad qtquick3dphysics: include the new cooker tool to images
QtQuick3DPhysics has a new runtime tool that should be included
in the images.

Pick-to: 6.4
Change-Id: Ib6dd643217b1dea76ff42a48183f78427cc2eadf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-10-20 07:18:58 +00:00
Samuli Piippo
322b7b32f3 Revert "qtdeclarative: fix test builds"
This reverts commit 810f41bd6a.

The commit was been reverted in qtdeclarative, patch is no longer needed.

Change-Id: I26e13bb2c8c1b0e464cc69673df56833ea7a9985
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit c6e8ab8bc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 07:18:49 +00:00
Qt Submodule Update Bot
fe2f95b36d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I94e0163046beb067d7909043bebfe578ac66f6f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-20 07:18:39 +00:00
Samuli Piippo
0bb5361fe0 qtbase: avoid cmake archiving api for native build
After 812bf25183, we need to extend the
workaround for badly configured CMake also to qtbase-native. This fixes
error: CMake was not built with zstd support. Rebuild CMake or
set QT_AVOID_CMAKE_ARCHIVING_API=ON.

Fixes: WEBOSCI-54
Pick-to: 6.4 6.2
Change-Id: I33c97b1a051fe90d706461c83f75912aa1c1c820
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
2022-10-10 11:52:08 +00:00
Samuli Piippo
18e0008e9e qtinterfaceframework: add RRECOMMEND for the simulation package
If simulation support is enabled, make sure the package gets installed
to the image and toolchain. CMake files have references to the plugins
which causes builds to fail if interfaceframework is used with the SDK.

Pick-to: 6.4 6.4.0 6.2
Change-Id: I7cf0fc334644ce38e783f6b7e21a7f5b082dacd0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-09-15 04:49:22 +00:00
Samuli Piippo
097d8a347e ptest: fix test build with latest qml tools
Qml tools are now using --bare option, which limits where the tools
tries to find the qml modules. For the test builds, we again need to
use QT_ADDITIONAL_PACKAGES_PREFIX_PATH to tell the tools where to
find qml files for the Qt module we are currently building.

Task-number: QTBUG-106365
Change-Id: I6dfcd32f405475de0f58448cbaa7a19e26cbcfe8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 63eeb3b83e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-13 16:29:26 +00:00
Samuli Piippo
497624e967 ptest: remove references to destination directory
Tests are build against the destination directory where qt module was
just installed. This causes extra files to be taken into source package
and adds references to the TMPDIR, which produces QA warnings from
buildpaths QA test. Use DEBUG_PREFIX_MAP to get rid of those paths.

Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-105913
Change-Id: I01ed9261004410db307f2cd809a181377b734c9e
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-09-01 05:16:14 +00:00
Samuli Piippo
3102804b65 ptest: remove build paths from tests
Testlib adds references to the build and source directories to tests,
which causes warnings on buildpaths QA test. Remove those references.

Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-105913
Change-Id: Ic63e72a0b11bef55876ef5ca40d0c1d753243004
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-09-01 05:16:09 +00:00
Samuli Piippo
ee836b7a9f qtbase: remove unneeded scripts
Reduce warnings from buildpaths QA test (contains reference to TMPDIR)
and remove few build utils that are not usable in bitbake build.
Run same do_install steps for all qtbase builds instead of keeping
separate ones for nativesdk.

Pick-to: 6.4 6.3 6.2
Change-Id: Id8a6c4c3b03a850bdb1f99e3a3a08973e134eafc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-24 12:32:18 +00:00
Samuli Piippo
8fb6c082d4 Remove QMAKE_PRL_BUILD_DIR from prl files
Reduce warnings from buildpaths QA test (contains reference to TMPDIR)
by removing QMAKE_PRL_BUILD_DIR from prl files.

Pick-to: 6.4 6.3 6.2
Change-Id: I1a5fbac82c4a026b6ba41db3b0cca6a9fbf1e31a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-24 12:32:14 +00:00
Samuli Piippo
8228b69a19 qmlcompilerplus: add dependency to native
If we stop forcing build of target tools, we then need to have
dependency to the native package.

Pick-to: 6.4 6.3 6.2
Change-Id: Ie5d9634ba4c85af877920e66fd88d36880af8afc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-17 05:17:35 +00:00
Samuli Piippo
7d1d6a11af qtbase: remove initial host path from CMake files
Amend 0b55d8ec94 and remove the initial
host paths from CMake files. They point to the temporary build paths
and cause build breaks in declarative builds.

Pick-to: 6.4
Change-Id: I17d46b989f024e71ec617ff130c8ea7d7fc85641
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-15 12:59:16 +00:00
Samuli Piippo
fa46e269e3 sdk: rework how QT_HOST_PATH is set in sdk
After qtbase change 0f8017efb6d037c4f33f947eb3c56aeafa28313c, QT_HOST_PATH
is no longer set in qt.toolchain.cmake, but it was moved to Qt6 package
cmake files. Since the package is in target sysroot, we can no longer use
its location to determine the absolute path of the host sysroot. Instead,
resolve QT_HOST_PATH now in the CMake subscripts and use them also without
the environment-setup script from Qt6Toolchain.cmake.

Change-Id: I81d908321c0d05ab589b9340a62a45800e936252
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0b55d8ec94)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-15 12:59:01 +00:00
Michal Klocek
a565bccb07 Add zlib dependency for qtbase
Zlib is mandatory dependency, meaning if there is no system
one qt will do bundled one. This is important to
know which one is used as webengine will try to build also
bundled one.

Task-number: QTBUG-103149
Pick-to: 6.4 6.3 6.2
Change-Id: Ie7cc83dea558a5605295133fb0bf6fe0a3217492
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-08-09 12:36:55 +02:00
Samuli Piippo
85d9d71e27 Coin: enable examples for qtapplicationmanager
Pick-to: 6.4 6.3 6.2
Change-Id: If4065a9b309fafd8e05d018495dedd22be956aa7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-09 10:36:34 +00:00
Samuli Piippo
810f41bd6a qtdeclarative: fix test builds
Revert commit that causes ptest build to fail when QmlCompiler is used:
ld.gold: error: [...]/recipe-sysroot-native/usr/lib/libQt6QmlCompiler.so.6.5.0: incompatible target

Pick-to: 6.4 6.3
Change-Id: Ief349b65f59d57c5e0299adb4304278f70da3578
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-09 10:36:15 +00:00
Janne Juntunen
ec51270404 qtbase: update SDK patch to work with latest qtbase version
Some lines from qt.toolchain.cmake.in were moved elsewhere, causing
the need to update meta-qt6's SDK patch to match these changes.

Pick-to: 6.4
Change-Id: I2b7ff9b6fa009e5a654f97ddd05541d5fa0e84ad
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-08-09 10:36:02 +00:00
Qt Submodule Update Bot
40583d1a0c Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Icc86661b67e1196501ec3fc9518ead88ce7787db
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-09 10:35:51 +00:00
Samuli Piippo
812bf25183 qtbase: build native and nativesdk with zstd enabled
rcc is using zstd to compress resources, so that needs be
enabled also in native and nativesdk builds.

Pick-to: 6.4 6.3 6.2
Change-Id: Ic10758eb41a67712e55b44bfec4d4385d0512f7e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-09 05:59:54 +00:00
Qt Submodule Update Bot
05f4eac711 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie7e5cd2427027ca74e6a1e29789bb0a9f4c86b1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-25 12:44:00 +00:00
Michal Klocek
9c2b02aab6 Fix minizip usage in qtwebengine
WebEngine needs minizip which is part of zlib.Till now it always built
bundled zip as minizip recipe does not exist in poky and moreover this
was never a configurable feature as it was not in PACKAGECONFIG.

A change in https://codereview.qt-project.org/c/qt/qtwebengine/+/384262
enables compilation of bundled minizip against system zlib (by using
shim headers) however it is not advisable as those two version of zip
might be different and minizip is project wise a part of zlib.

Therefore introduce cheap rip off of zlib recipe, however
building minizip from same source tree.

Task-number: QTBUG-103149
Pick-to: 6.4 6.3 6.2
Change-Id: I1e36d2fba339fb5383018f05a6347c27dde0c8c1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-07-21 18:13:02 +02:00
Qt Submodule Update Bot
582176f1e4 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ibf4c7770abce1b6c06dd9caea2e2f8e281b24cef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-18 13:12:09 +00:00
Samuli Piippo
6a8e3aab59 qtquick3dphysics: add dependency to qtquick3d-native
Needs explicit dependency to qtquick3d-native if tools are not
built for the target.

Pick-to: 6.4
Change-Id: I999a946536a4f15620f10d60e5c3195a0d1f4b9b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-07-18 06:22:29 +00:00
Samuli Piippo
49bfeff2bf qtdeclarative: enable tests that failed with gold linker
Remove patch that was used to disable tests failing to build with gold
linker. After qtbase commit 40c8bc42026a8cf118ab60920314d84856c397a6,
the long stanging issue with gold linker and qt_version_tag symbol [1]
seems to be resolved.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304

Pick-to: 6.4
Change-Id: I522b101929c99ebe35fcb6948be46c85b07eefd2
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-07-13 18:30:57 +03:00
Qt Submodule Update Bot
c20db41ae1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I4269b332b6c44f63af8b0a4731b678b7a378daed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-13 15:30:55 +00:00
Samuli Piippo
cc13555263 qtdeclarative: remove patch
The fix was merged and patch is no longer needed.

Change-Id: I013e2077638fe692bf6f494b1e12115e3edaaa2a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-07-13 18:30:54 +03:00
Samuli Piippo
9f297583dc qtapplicationmanager: remove unneeded patch
The fix was merged and patch is no longer needed.

Change-Id: I27f8bf0497fbbf86a4e81b5ca5a1591b4a663cbc
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-07-13 15:30:53 +00:00
Samuli Piippo
c2027fb867 qttranslations: update licenses
Update licenses after SPDX changes were applied to the module.

Change-Id: Ic6bf4edc58096483315835868ad096af526e8652
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-07-13 15:30:52 +00:00
Samuli Piippo
88efd33036 qthttpserver: add PACKAGECONFIG for websocket
Add PACKAGECONFIG for the optional WebSockets integration.

Change-Id: Id5f693be968e51fbae6fca9bc712d61eee0bfc54
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit b12809e2d8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-13 15:30:50 +00:00
Samuli Piippo
dc388dea7a qtlanguageserver: update licenses
Update licenses after SPDX changes were applied to the module.

Change-Id: Idb7f50c2c031a79ecf98a09e3da2883877498970
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit ad37ff1b6f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-13 15:30:49 +00:00
Samuli Piippo
fa8cf58215 qtwebchannel: update licenses
Update licenses after SPDX changes were applied to the module.

Pick-to: 6.4
Change-Id: I275fa9e39923d69149f03844022cb86819cc61b6
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-07-06 06:51:58 +00:00
Samuli Piippo
928a97fd48 qtbase: add runtime dependency to vulkan-loader
Dependency to the vulkan-loader need to be runtime to correctly
pull it into the image.

Pick-to: 6.4 6.3 6.2
Change-Id: I76be6de10d3515826e16b71444828a043c06970b
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-30 07:41:01 +00:00
Samuli Piippo
799eb8622f qtapplicationmanager: fix compilation with GCC 12
Change-Id: I871c5507a01b1924825b7ed9a145176d61e5b3a7
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-27 13:19:02 +00:00
Samuli Piippo
9a4458dae2 qtmultimedia: update licenses
Update licenses after SPDX changes were applied to the module.

Pick-to: 6.4
Change-Id: Ic6ba168b88633f1cd065ecbba2172fbb7ecaafe6
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-27 13:18:57 +00:00
Samuli Piippo
ca64e61b97 qtwebengine: update licenses
Update licenses after SPDX changes were applied to the module.

Pick-to: 6.4
Change-Id: I5fba720fd55b7a5912e81617e3b25f40eed47da1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-27 13:18:53 +00:00
Samuli Piippo
3a2a6defe2 qtspeech: update licenses
Update licenses after SPDX changes were applied to the module.

Pick-to: 6.4
Change-Id: I13fce8829bc236f698091980a65a1f67c9fa744c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-27 13:18:48 +00:00