Commit Graph

549 Commits

Author SHA1 Message Date
Samuli Piippo
2cdb899281 Support SDK workflow inside a Yocto build
Add support for using qmake directly from Yocto build sysroots
with following workflow:

bitbake meta-ide-support
bitbake build-sysroots
. ./tmp/deploy/images/qemuarm64/environment-setup-cortexa57-poky-linux
qmake & make

Use configurable sysroot paths in populate_qt6_sdk_base so that it can
be reused also for yocto build sysroots.

Fixes: QTBUG-108778
Change-Id: Iee48f75edbc62e5adcca318a9f4cf17b7477f4a0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 0533b8907e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 07:20:05 +00:00
Samuli Piippo
9412f99cda 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.

Task-number: QTCREATORBUG-27372
Change-Id: If27d595965df59ff9846f4c773469889a8480040
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit cfaf86d808)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 07:19:56 +00:00
Samuli Piippo
48d735ab6e 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

Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 23feda4f5b)
2023-01-12 07:19:31 +00:00
Qt Submodule Update Bot
6a158bd064 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I9ca22e621c1f27e6a886466ba350536d72110179
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-05 23:01:10 +00:00
Samuli Piippo
187f6dcc86 layer: add mickledore to LAYERSERIES_COMPAT
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ad7dc64e16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-05 10:02:21 +00:00
Qt Submodule Update Bot
cd1202213f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I9fbe3ff6e788cb2c3a96221be79bf477888ad1c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 07:37:41 +00:00
Samuli Piippo
4f7d02004c Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 918cb5b310)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-14 16:53:37 +00:00
Samuli Piippo
977b3c8e09 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.

Task-number: QTBUG-109319
Change-Id: Ib61164839fdbc5938a23b92ab03f3c07e945812f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 28842c8014)
2022-12-12 13:57:07 +02:00
Samuli Piippo
8272a64f16 qtwayland: remove xcomposite PACKAGECONFIGs
The XComposite buffer sharing extensions have been removed from QtWayland.

Change-Id: I681ad58338567f8666f812c5acea4a7bbf9a87f4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 50fc8ccb9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-08 16:18:10 +00:00
Mikko Gronoff
23319d2f3e Bump PV to 6.4.3
Change-Id: I19fe4c0e54f7180426b16695b75af8fe1305705f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-12-05 09:29:10 +02:00
Qt Submodule Update Bot
6e3874cd75 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia31fb3b2fc94e39466531ee881627134c79d4657
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-01 13:56:24 +00:00
Qt Submodule Update Bot
2d57b22d6d Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia26334e6bd7e3ef6b484db1eeffe1777fae83692
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-30 11:30:32 +00:00
Mikko Gronoff
cdedef82ef Revert "webengine: add patch for python 3.11 build issue"
This reverts commit 2495915e3a.

Reason for revert: Included in upstream chromium with latest submodule update

Change-Id: I0d64185e1e5cb6aa181c18d4b758c4ca9e616395
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-30 11:30:30 +00:00
Qt Submodule Update Bot
94989d0eee Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib3a7feb697ea8765d87183eac6e82e8e0908ad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-22 12:49:05 +00:00
Qt Submodule Update Bot
52ed82f3d6 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3729006113b59690edcfb9eefc9bce70dc4861f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-19 06:22:29 +00:00
Qt Submodule Update Bot
2cbb86c271 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I0b504b13261bd8098c235ad2637eac04407b5889
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-15 01:31:19 +00:00
Qt Submodule Update Bot
360f0c7520 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I777e0b8e9b70fbb163456c362622cd7f2134ad66
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-12 03:04:30 +00:00
Samuli Piippo
e33f206aa7 sdk: add new class for populating qt6 sdk
Add new class that can be used to create toolchain containing
all available Qt modules.

Change-Id: I84982749ea9093bbbd20f99391b063c4bcaee39f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 63ba821b5c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-11 16:02:54 +00:00
Mikko Gronoff
68cd5cd824 Bump PV to 6.4.2
Change-Id: I1da65d00e7bd0027353373abad460a157335628d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-10 14:53:08 +02:00
Samuli Piippo
f79af87ebc 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.

Change-Id: I0bea658d689fb99596374701b11aa9ce028e882d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4c5d3e2c3c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-10 07:19:38 +00:00
Samuli Piippo
b0b30c1e99 qtwebengine: add dependency to cups
Printing support needs cups in cases when it's not already enabled
in qtbase.

Change-Id: I5435bdd61b418f91524726571c9acd2cea92c729
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7731aab502)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 16:02:16 +00:00
Samuli Piippo
488d88cecd CI: tests against langdale
Update CI builds to use langdale instead of honister releases.

Change-Id: Ib18be53b6d3308d5e4c5a2269b40ce67a4c352ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0648a0a4ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 16:02:16 +00:00
Mikko Gronoff
2495915e3a 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.

Change-Id: I6308d2acd17a74b20ad6651d59f34e7246dc96ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 676e6da41b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-03 08:09:50 +00:00
Qt Submodule Update Bot
3e19af3608 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I6f90ad07f7ed3d2249863735a5671c98b67292c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-03 08:09:28 +00:00
Qt Submodule Update Bot
cfbb672e4c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I2e5a33b5b517736b8f545be4c9ace34e2300cb16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-26 17:28:43 +00:00
Samuli Piippo
c8b68f42a6 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.

Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit e950cff143)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:51:10 +00:00
Qt Submodule Update Bot
32f314a804 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I43fe57c91fd4b45565fefe5c1a5ed1c96a012fc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 02:13:06 +00:00
Samuli Piippo
1ff68d381d qtquick3dphysics: include the new cooker tool to images
QtQuick3DPhysics has a new runtime tool that should be included
in the images.

Change-Id: Ib6dd643217b1dea76ff42a48183f78427cc2eadf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 444b6cc7ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 12:03:30 +00:00
Qt Submodule Update Bot
b1098ad35f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ibb9446bd62789bd502029acf4363d18b1ac084d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-19 12:41:34 +00:00
Qt Submodule Update Bot
58494287fa Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3e1eadb02c8b057d1bfdb4232c46482ade664905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-18 20:00:45 +00:00
Qt Submodule Update Bot
f845625029 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I7f5c0841a6d0c72c06b5b07098431c10e6f3b3d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-17 15:27:09 +00:00
Qt Submodule Update Bot
229a8aa72c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib69e9e7ef613d3ab51729248e84d7e1c7edbb732
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-14 20:27:43 +00:00
Qt Submodule Update Bot
13fa05a85d Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I705c5d4cfadd797580b1e9efe1d2f64fa6329537
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-13 17:31:46 +00:00
Samuli Piippo
25fde8d225 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
Change-Id: I33c97b1a051fe90d706461c83f75912aa1c1c820
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
(cherry picked from commit 0bb5361fe0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-10 17:29:23 +00:00
Qt Submodule Update Bot
c8b5b038b8 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4602d6622c1d164b0388429f78faa77dd4e56c99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-10 03:19:51 +00:00
Qt Submodule Update Bot
7e80361dd8 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I32dd23ced3a1c298f061f48292aa16c4d680792b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-06 19:38:12 +00:00
Qt Submodule Update Bot
d5005ea344 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Iad4a5769adba631a25f673f74131711c66da7640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-04 03:19:49 +00:00
Qt Submodule Update Bot
3a3a8a3f07 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib4569ba3b7c9fca5accc352fde93233c61c3cb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-30 17:58:54 +00:00
Qt Submodule Update Bot
20019ba1a2 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Iea589e6d2a32fa92e467955bab9222cd814b85bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-27 10:17:07 +00:00
Qt Submodule Update Bot
8b1cbd2106 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I1143e3938c903fa08941ef751035e391d20cf87c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-20 17:04:11 +00:00
Qt Submodule Update Bot
6a31110ac7 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia5ebd30942883d0a3d60677c428419cfc29691c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-19 18:31:34 +00:00
Samuli Piippo
fc712f0ad3 Bump version to 6.4.1
Change-Id: I7db1353767dd4a77a36ab8de77c6049fd3e931fc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-09-19 18:31:33 +00:00
Qt Submodule Update Bot
56f1a85834 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I51509810e629ac1882d57bae1003422d25eecaea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-16 00:52:46 +00:00
Samuli Piippo
43b3fbce4e 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.

Change-Id: I7cf0fc334644ce38e783f6b7e21a7f5b082dacd0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 18e0008e9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-15 05:44:42 +00:00
Qt Submodule Update Bot
b9c9ddab3f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I724b292d60a93ffdaa2305e70ff1b718e510b011
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-14 18:41:50 +00:00
Qt Submodule Update Bot
7135d8a2fd Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Id43ebb56f135a4642504621879a013861905e4f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-13 21:22:57 +00:00
Samuli Piippo
5a8ac5afd2 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
Qt Submodule Update Bot
f978e5662a Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4de7e53dee7b2fe7063f35448539ddbc4b034dc5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-12 18:00:24 +00:00
Qt Submodule Update Bot
ae49fb1b37 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4c19099db45b95b970fb0b387f05dac99f0fa4ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-09 18:56:30 +00:00
Qt Submodule Update Bot
026698ac3c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I25582c61857acf89823811c2aad35f40990d3b76
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-08 07:51:55 +00:00