Commit Graph

540 Commits

Author SHA1 Message Date
Samuli Piippo
cfaf86d808 sdk: move sdk mkspec additions to qtbase recipe
The qmake mkspec additions are used with the sdk when the toolchain
environment-setup script hasn't been run. Instead of adding those in
the sdk creation phase, do it already in the qtbase recipe.

Change the mkspec also so that CC/CXX has only the compiler executable,
but none of the compile flags that usually are there in Yocto builds.
This keeps Qt Creator happier as well.

Pick-to: 6.5 6.4 6.2
Task-number: QTCREATORBUG-27372
Change-Id: If27d595965df59ff9846f4c773469889a8480040
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-11 14:45:22 +00:00
Samuli Piippo
23feda4f5b Add workaround for broken harfbuzz cmake config
Latest harfbuzz 6.0.0 has bad cmake config that uses absolute paths,
which breaks static builds for Qt. Add workaroud that causes Qt
to use pkg-config to find correct paths for libs and includes.

From qtshadertools build:
ninja: error: '/usr/lib/libharfbuzz.so.0.60000.0', needed by
'lib/libQt6ShaderTools.a', missing and no known rule to make it

Pick-to: 6.5 6.4
Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-11 14:45:12 +00:00
Qt Submodule Update Bot
cfbcd5f4f1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Id9246b401328e0f3bc9c04b42e37a9361dce34d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-05 10:32:10 +00:00
Samuli Piippo
ad7dc64e16 layer: add mickledore to LAYERSERIES_COMPAT
Pick-to: 6.5 6.4
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-04 08:22:41 +00:00
Qt Submodule Update Bot
be98220dcf Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Icbe7a67e02e34bf42f1b1b2f1e870559be560d1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 16:21:38 +00:00
Samuli Piippo
afcf7b2858 qtvncserver: update license files
Change-Id: I29db1238fa7fd5222fe18c60b4446a076f56f412
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-03 16:21:36 +00:00
Samuli Piippo
6826a6aa09 readme: add 6.5 branch details
Pick-to: 6.5
Change-Id: I580b98bac50e57aad08af540ede6646f6801bc4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-03 11:12:54 +02:00
Samuli Piippo
ee488f6111 qtvncserver: update license checksum
Module switched to SPDX license headers.

Change-Id: I84ab9ab1b9228fe714d940035500b38ed1198ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-12-22 05:43:08 +00:00
Qt Submodule Update Bot
d2a6f8bcf1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I84a183df6a6a360998ea3f3a48544280bef5806d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-22 05:43:07 +00:00
Mikko Gronoff
98edd0f33d Bump PV to 6.6.0
Update/replace previous version update commit
35cf4c22b1, dev branch
is the future 6.6.

Change-Id: I7a57abbf64a5219271dc7fbf5a9fe84de1d038a3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-12-19 09:01:14 +02:00
Qt Submodule Update Bot
22ae587790 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I5313d97dc76405a1171d44ba4117a7218459a97f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-16 22:53:51 +00:00
Mikko Gronoff
35cf4c22b1 Bump PV to 6.5.1
Change-Id: I7fc0d86aac9ad4304b079fbab316dcf77b577033
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-12-15 09:11:15 +02:00
Samuli Piippo
918cb5b310 Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Pick-to: 6.5 6.4 6.2
Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-14 11:38:54 +00:00
Qt Submodule Update Bot
124fd6fd54 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia6f93574b24e543e479169897f2d050fc949c0c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-13 01:06:41 +00:00
Samuli Piippo
28842c8014 Don't validate the SRCREV value against the branch
Qt modules recently lost all their release branches in their git
repositories. This broke previous releases since bitbake validates
that SRCREV can be found from the current branch. Add additional
parameter to repo URI to stop bitbake from validating the SRCREV.

Pick-to: 6.4 6.4.2 6.2
Task-number: QTBUG-109319
Change-Id: Ib61164839fdbc5938a23b92ab03f3c07e945812f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-12 06:39:37 +00:00
Samuli Piippo
50fc8ccb9e qtwayland: remove xcomposite PACKAGECONFIGs
The XComposite buffer sharing extensions have been removed from QtWayland.

Pick-to: 6.4
Change-Id: I681ad58338567f8666f812c5acea4a7bbf9a87f4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-08 11:34:39 +00:00
Samuli Piippo
a03da688dc qtwebengine: disable ptest
Temporarily disable ptest until fix is merged.

Change-Id: I6662af0ad2a3e011ad8712c6aa2e065eb55b21b5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-12-07 08:05:59 +00:00
Mikko Gronoff
0a2bc5a74d Revert "webengine: add patch for python 3.11 build issue"
This reverts commit 676e6da41b.

Reason for revert: Patch included now in upstream chromium with latest submodule update.

Change-Id: Iec46fcf9bc0e89c53f5c61d19cceed88d639b412
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-12-07 08:05:52 +00:00
Qt Submodule Update Bot
b5ccdd5e20 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Idd728ffe02dfc4a0759747374e249779a7245e27
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-12-07 08:05:40 +00:00
Samuli Piippo
6db104bd29 Add recipe for QtgRPC
QtgRPC module is Providing protobuf and gRPC support for Qt.

Cannot include nativesdk-qtgrpc in the sdk yet, since it requires
fix to protobuf recipe in meta-openembedded.

Task-number: QTBUG-107921
Change-Id: Ie5ef1b493b1b5550c7b7f308a638c9855342dfa5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-24 12:20:31 +00:00
Samuli Piippo
fb725ebed9 Add recipe for QtLocation
QtLocation is back in Qt 6.5.

Task-number: QTBUG-108731
Change-Id: Id86ade02040d626ecadb6c35f173b3be25f02e97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-11-24 05:53:33 +00:00
Qt Submodule Update Bot
ba055c2d9b Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ie7169b46d6922bdfa3ad411278d453fb1be9b6fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-17 13:46:41 +00:00
Qt Submodule Update Bot
051919e2a4 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia5513e6fef214f2f2eba64acf77e9232811fc41f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-14 23:34:10 +00:00
Samuli Piippo
c48b6f8890 Use *-tools package only for tools
Some of the modules have executables that are necessary for the
module to work properly. Don't put them into the *-tools package
which is not installed by default.

Task-number: QTBUG-99702
Change-Id: I7a9e8532862644574bd2bfb729e6efe466dac070
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-14 08:06:30 +00:00
Samuli Piippo
2f6951d07b Don't force tools for target
Compile time tools are not generally needed on the target.
Don't force them by default, but make it possible to enable
them with QT_FORCE_BUILD_TOOLS = "ON".

Task-number: QTBUG-99702
Change-Id: If2d3ce9252213b28cc06efe0e9c5cfd57db81371
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-14 08:06:25 +00:00
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