Commit Graph

942 Commits

Author SHA1 Message Date
Samuli Piippo
e0590ac76e qtbase: use correct relative path for scripts
Scripts in bin and libexec dirs need to have different relative paths
patched.

Pick-to: 6.9 6.8 6.5
Change-Id: I76c030ca2cd446411ca0b77ecdb06849dc1e8121
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-01-23 07:09:19 +00:00
Samuli Piippo
8cbc0ed24f qtgrpc: add optional dependency to qtdeclarative
QtGRPC has separate Quick module that needs qtdeclarative dependency.

Pick-to: 6.9 6.8
Fixes: QTBUG-132818
Change-Id: I639ad8a271e1fb51b0c5ecf5a2de467ee1583f81
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-01-17 11:12:22 +00:00
Samuli Piippo
edce4936b4 qtopcua: add opcua tools to sdk
QtOpcua has host tools that need to be included in the SDK.
Add additional PACKAGECONFIG for open62541 which has openssl
dependency. Mingw32 does not support this in nativesdk builds,
but it's also not necessary for either native or nativesdk builds.

Pick-to: 6.9 6.8
Fixes: QTBUG-132822
Change-Id: Ib0c9f7634ac578882ca5585be430312736f61470
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-01-17 11:12:09 +00:00
Samuli Piippo
60db51682c qtwebengine: fix conflicting files with qtpdf
QtWebengine and QtPdf now generated SBOM files for both
modules. Need to remove wrong one to avoid conflicts.

Pick-to: 6.8
Task-number: QTBUG-128893
Change-Id: I9baa4460a63e72e077e1b337906eac0c2d44a9af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7166be5225)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-16 15:41:35 +00:00
Samuli Piippo
3feadcb30b qtapplicationmanager: update revision
Update revision to fix ptest build.

Task-number: QTBUG-132649
Change-Id: Ifa09551b8713e707d93695a8b47ed40c267914b4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-01-10 18:00:03 +00:00
Samuli Piippo
2da362ade0 qtbase: update patch
Update patch to work with latest changed.

Pick-to: 6.8
Change-Id: I9834ec4d39ae657d4b89530ae454198db339f04e
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 28deeb771f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-10 17:59:56 +00:00
Mikko Gronoff
87ef009a93 Bump version to 6.10.0
Change-Id: Ie3136b7c629c86a5f8894de061d4a05fc55819d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2025-01-10 17:59:43 +00:00
Qt Submodule Update Bot
32e3237b72 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ic49f156c0372bcd850b644fb67017f3d659bdb3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-10 17:59:35 +00:00
Samuli Piippo
a8aedea1e7 qtbase: remove upstreamed patch
Fix for the DRM device is now merged in qtbase.

Change-Id: I9d53e01beb5b895ee1c8141683a9ef7208ac0f94
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 93375bcb1c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-07 21:08:01 +00:00
Samuli Piippo
dc4375cd45 readme: add 6.9 to support table
Update the support table with Qt 6.9 details.

Pick-to: 6.9
Change-Id: Icd4884b04ca003008998cf7704fa3feedff6fa25
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-01-03 09:27:25 +02:00
Samuli Piippo
bae0db8d76 Install module JSON files to INSTALL_ARCHDATADIR/modules
The module description JSON files contain architecture-specific
information. Therefore they should reside below INSTALL_ARCHDATADIR
instead of INSTALL_DATADIR.

Pick-to: 6.9 6.8 6.5
Fixes: QTBUG-132428
Change-Id: Ib6f2e8939e27f136ac6cb04e74b9d688c8600b2b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-01-02 10:53:43 +00:00
Samuli Piippo
9b6d9d6287 Use correct QmlImportsPath config with qmake
Qml2ImportsPath is deprecated config and QmlImportsPath should
be used instead. This fixes qmake crash on aarch64 linux when
using GCC 14.

Pick-to: 6.9 6.8 6.5
Fixes: QTBUG-132288
Change-Id: I683ae7755b0b8ac496eeb8017c1c0d059b2fe011
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-12-19 06:48:14 +00:00
Samuli Piippo
5fa2f694a3 qtconnectivity: move declarative dependency to examples
QtConnectivity does not have dependency to declarative other than
in the examples. Move the dependencies to example PACKAGECONFIG
so the module can be built with minimal dependencies.

Pick-to: 6.9 6.8
Fixes: QTBUG-131341
Change-Id: Id43f4c295aa2283d322d85c115797d6eb70843c5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-12-18 14:14:25 +00:00
Samuli Piippo
0e9320d12e qtbase: workaround for incorrect DRM device
EGLFS queries DRM device path to be used, but his can occasionally
be incorrect. Allow use of kms.conf (via QT_QPA_EGLFS_KMS_CONFIG)
to be used to override the device.

Task-number: QTBUG-131887
Pick-to: 6.9
Change-Id: Ica0a572c02fafee9f2333a5d2eacd73d12864d8b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-12-18 14:14:11 +00:00
Mikko Gronoff
69ede9570f qttranslations: include SBOM files
Update recipe so that generated SBOM files are
also included (by default to -dev package for all
modules).

Fixes QA Issue:
 "qttranslations: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/sbom
  /usr/lib/sbom/qttranslations-6.8.2.spdx
 "

Pick-to: 6.9 6.8
Change-Id: I81585f1c4deb9a925bbab0b8a3182a1d87b00632
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-12-16 13:49:07 +00:00
Samuli Piippo
058ecf647d qtbase: always build linuxfb platform plugin
The linuxfb platform plugin can be useful even when opengl is
available to test out software rendering capabilities of Qt.
Build it always by default.

Pick-to: 6.9 6.8
Change-Id: I74f052f01cada65b94b1cb9e9893e9c5071a045e
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-12-11 13:39:23 +00:00
Qt Submodule Update Bot
9194f780b0 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: If9140c1c219035a3b6bd77f7337e2558d94f076e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-09 14:32:52 +00:00
Samuli Piippo
5f20803d1c Add option to export example sources
By default, the example sources are not exported with the binary,
as was the case in qt5 times. Add options to enable the export
using variable QT_INSTALL_EXAMPLES_SOURCES = "ON".

Pick-to: 6.8
Change-Id: Ieedb65034264086b84d4df541480cbb02ecb82f2
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2024-12-09 06:30:22 +00:00
Samuli Piippo
e1e8645a3b Remove unneeded example files path
All examples are now in correct paths.

Pick-to: 6.8
Change-Id: I37a57e0674877c321ddacaf69af0b615f383ec07
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-12-09 06:30:15 +00:00
Qt Submodule Update Bot
d229fee518 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I8b9dd463692aef61967c67145fd26609fc3268a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-04 01:09:30 +00:00
Mikko Gronoff
a11bc6bb2b qtmultimedia: update revision
Update to a revision including fix for QTBUG-131300.

Change-Id: I78d44dbebe31bfa16f0ebc6aa961a76245c740da
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-11-26 15:02:26 +02:00
Samuli Piippo
0892d298bc sdk: always include build tools
Include cmake and ninja always to sdk since mingw
can build both starting in kirkstone.

Pick-to: 6.8
Task-number: QTBUG-131438
Change-Id: Ie5ab5320d412a11526682d15fa4fa15abb4ebd91
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-26 07:03:28 +00:00
Mikko Gronoff
886380c152 qt6: update licenses
- The Qt-GPL-exception-1.0 license has not been used in few modules
  for a while and the license file was now removed.
- qtquick3d, qtsvg & qtopcua updated with latest license changes.

Change-Id: I58b2b5afe0c8feb9a63a692586ceaf562d95d4b9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-11-26 09:03:19 +02:00
Mikko Gronoff
c38a3364b0 qt6: update licenses
The Qt-GPL-exception-1.0 license has removed from
qtmqtt & qtnetworkauth modules.

Change-Id: I6dbb14ff604baf05a855e3c96200a673bb83c342
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 768b29cfc6)
2024-11-26 07:03:15 +00:00
Samuli Piippo
1845a8d66d qttools: remove merged patch
The fix was merged in upstream.

Pick-to: 6.8
Change-Id: I177595444e1b6a960894648e6a296377e1498a79
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-26 09:03:10 +02:00
Qt Submodule Update Bot
7dec315566 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I4a81b573c670ecc7a53ad65a34692473233c4b24
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-11-26 09:03:07 +02:00
Samuli Piippo
be92484450 qt6: update licenses
Continue license changes from 92833a85e7,
more modules are affected.

Pick-to: 6.8
Change-Id: Ide2ea6f5c9d040c193a146964029241ce3531379
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-08 10:12:14 +00:00
Qt Submodule Update Bot
55d8e6b0c4 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia70dd3a530360ca335d765894b29e58bda2b8f2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-08 10:11:58 +00:00
Samuli Piippo
982e714683 qtquick3d: remove patch
The fix was merged.

Change-Id: I60d89a1bc8eda3c5ada3751969267c6d6e0b5e0c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-07 11:32:59 +00:00
Samuli Piippo
92833a85e7 qt6: update licenses
The Qt-GPL-exception-1.0 license has not been used in few module
for a while and the license file was now removed.

More accurate licenses for qtdoc and webengine modules.

Pick-to: 6.8
Change-Id: I7833593f0e45fb4c89cc8deff6124835dce3ba41
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-07 11:32:52 +00:00
Mikko Gronoff
0e8ae2992f qtapplicationmanager: remove patch
The patch is now merged upstream.

Change-Id: Iece64a6f482d478521558c79e9ec06919107d4d0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3cef727dc8)
2024-11-07 11:32:45 +00:00
Qt Submodule Update Bot
878d69d39d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ia571bb1b582fff0e4a16f6ba128f023a1bbd3b75
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-07 11:32:37 +00:00
Samuli Piippo
a73f4a0f48 layer: add walnascar to layer series
For the next Yocto 5.2 release.

Pick-to: 6.8
Change-Id: I813c4ad4271a3d59c73a5ea53aa99efac6a39eca
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-05 13:54:46 +00:00
Samuli Piippo
e8cf73dca6 qttools: check available clang version
qttools required at least clang 17. Don't try to enable the support
unless suitable version is available. meta-clang defines LLVMVERSION
global variable with the version number.

Pick-to: 6.8
Change-Id: I9df38bb475391a177daa8fde349718529f4350e5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-11-05 13:54:38 +00:00
Samuli Piippo
6e1ec45c58 sdk: include staticdev packages by default
Some of the Qt modules have static libraries that need to be present
in the SDK for it work correctly. Use SDKIMAGE_FEATURES to include
staticdev packages to the SDK.

Fixes: QTBUG-130442
Pick-to: 6.8 6.5
Change-Id: I043e3ab02df212f6fdc656ae3dd542dd7a824fd9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-11-04 13:37:40 +00:00
Samuli Piippo
96ed615991 readme: update release status
Add 6.8 as new stable release, and mark 6.6 and 6.2 as EOL.
Add Yocto 5.2 Walnascar as new yocto release to be supported in
dev (6.9) and 6.8. Nanbield is no longer tested on CI.

Pick-to: 6.8
Change-Id: I3ba99550682a9b8868a096da99ade78def41e045
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-31 06:47:04 +00:00
Samuli Piippo
65b08e9246 qtpdf: workaround for wrong sbom file
Rename the incorrectly named sbom file

Fixes file /usr/lib/sbom/qtwebengine-6.9.0.spdx conflicts between
attempted installs of qtwebengine-dev-6.9.0-r0.cortexa15t2hf_neon
and qtpdf-dev-6.9.0-r0.cortexa15t2hf_neon

Pick-to: 6.8
Task-number: QTBUG-128893
Change-Id: I3e205d8546653a9daa1f778945d3e5770d3a2f84
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-29 14:05:02 +00:00
Samuli Piippo
958cb1592a Include SBOM files in -dev packages
Qt now produces SBOM (Software Bill of Material) files, include
those in the -dev packages.
The file cointains references to buildpaths, get rid of those
until fixed upstream.

Pick-to: 6.8
Change-Id: Ibe2972649db74925aab3fbe0307fd679e1ea53bf
Reviewed-by: Alex Bu <alex.bu@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-29 14:04:48 +00:00
Samuli Piippo
fcee8bec25 qtgrpc: workaround kirkstone build
QtGRPC now support only cmake-built protobuf, which causes builds
on kirkstone to fail, since it doesn't provided needed CMake support.
Add workaround so that toolchain builds can still be done, even though
it won't have support for GRPC tools.

Change-Id: Ica8d289b01f7c5856f5d42e26b810cd3adc78722
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-29 14:04:39 +00:00
Samuli Piippo
db307a670a qttools: fix another example tracking buildpaths
Update patch to cover another example that track buildpaths.

Pick-to: 6.8
Change-Id: I1632475346dfa0ff4e9e531a5001af81153b19df
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-29 14:04:31 +00:00
Mikko Gronoff
b7b83602d5 qttools: refresh patch
Change-Id: I42c8e0688467bdf58b46399d6012c9fe4cd45ffa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-10-29 17:04:24 +03:00
Qt Submodule Update Bot
a5848e2280 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ieef6e232f8315c5b602c0e1f2b7fca0da44fa4fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-10-29 14:04:14 +00:00
Mikko Gronoff
313ed5b19c Remove webengine related GCC13 patch
GCC bug affected webengine build in CI yocto branches (frozen master & nanbield), but the patch is now obsolete as master is correctly set to HEAD and nanbield got switched to styhead.

Pick-to: 6.8
Change-Id: Ie1964d4709c0ba4a46b6ab8f65408695665b753e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-10-25 06:52:14 +00:00
Samuli Piippo
e83389116c quick3d: fix GCC14 build issue with embree
Add workaround for building quick3d with GCC14. Builds would
otherwise fail on x86_64 targets using AVX.

Change-Id: Ie2c1c4e5aaa110d82594582588f170977855f20a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-24 12:38:05 +00:00
Samuli Piippo
abdf375a2e coin: add workaround for clang build
Add workaround until fixed in upstream:
nativesdk-liblldb contains reference to TMPDIR [buildpaths]

Pick-to: 6.8
Change-Id: Ie0c68644141fd0544e95895f67b031186a296a6a
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-18 12:48:47 +00:00
Samuli Piippo
aec6f0103f coin: build against styhead
Nanbield is EOL, switch the build to Yocto 5.1 styhead.

Task-number: QTBUG-128570
Pick-to: 6.8
Change-Id: Ie655e9a1dbfe0f806815c1d6951c01f262efb5a1
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-18 12:48:41 +00:00
Samuli Piippo
6e5df35989 qttools: remove buildpaths from the binaries
QDoc embeds a build time path to the qdoc binary and example
source path to the binary, which cause QA errors [buildpaths].

Pick-to: 6.8
Change-Id: Ib7e818e5b97ec9b753bc7ec8060d507770b71a3b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-18 12:48:34 +00:00
Samuli Piippo
39560e5566 ptest: skip buildpaths QA tests for ptest packages
A lot of auto test cases have references to buildpaths.
Skip the QA tests on failing modules until tests can be fixed.

Task-number: QTBUG-105913
Pick-to: 6.8
Change-Id: Id8d36278f5a42f131f79ea60503365b7c64a864f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-10-18 12:48:28 +00:00
Samuli Piippo
179259bc36 qtapplicationmanager: fix contains reference to TMPDIR QA issues
Temporarily add patch to fix a QA issue related to buildpaths.

Change-Id: If8e14c7834e2d20b22494549c0a1350cfdec6cb3
Pick-to: 6.8
Task-number: QTBUG-105913
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-18 12:48:19 +00:00
Samuli Piippo
78b79d3b55 qtgrpc: fix reference to TMPDIR QA issues
Temporarily add patch to fix a QA issue related to buildpaths.

Task-number: QTBUG-105913
Pick-to: 6.8
Change-Id: Ic86bd65e81d9189abf0d18bac98991028a69f06c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-18 12:48:13 +00:00