Commit Graph

442 Commits

Author SHA1 Message Date
Samuli Piippo
48b5dcc16b 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)
2023-01-12 11:18:53 +00:00
Qt Submodule Update Bot
d92e4fb63a Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: Ibac097a7bfb0e62c876f015eefca27f6c2a9bb77
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-07 12:40:53 +00:00
Qt Submodule Update Bot
8973e48353 Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: I6e822dc172bd767cec46cd7c879ba7c5c9acc0ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-01 01:05:16 +00:00
Qt Submodule Update Bot
4f0aa45c87 Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: I0a7b2dce41e5dd9ab53056f3b8594af8080726bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-30 14:07:37 +00:00
Qt Submodule Update Bot
a18b5ca85f Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: I00fa6fda068c83efd80c63a638ed5f2aafa5124f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-24 04:15:26 +00:00
Qt Submodule Update Bot
0a87979359 Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: Icda33191988e1862fc224180733679a09864d74a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-23 05:25:28 +00:00
Qt Submodule Update Bot
47ca98396d Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: I8f21c82b098af89157821c5b48c6aa7749187273
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-22 01:39:35 +00:00
Samuli Piippo
fb08ba47e9 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: Samuli Piippo <samuli.piippo@qt.io>
2022-08-19 07:15:22 +03:00
Mikko Gronoff
5bc4aa19d0 qt6-git.inc: switch to 6.3.2 release branch
Change-Id: I2c6c1b27e6d867decbe0bfd889af989eb2a4cdde
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-08-19 07:15:20 +03:00
Qt Submodule Update Bot
dcaf9882cd Update submodule refs on '6.3.2' in yocto/meta-qt6
Change-Id: I709a2b2f7d86a2a699699a2c627f0b7b24cbe94a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-19 04:15:19 +00:00
Michal Klocek
c525afc54d 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
Change-Id: Ie7cc83dea558a5605295133fb0bf6fe0a3217492
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit a565bccb07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 05:41:55 +00:00
Samuli Piippo
e5e8d56d1e Coin: enable examples for qtapplicationmanager
Change-Id: If4065a9b309fafd8e05d018495dedd22be956aa7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 85d9d71e27)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 05:41:48 +00:00
Samuli Piippo
e9c183e089 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.

Change-Id: Ic10758eb41a67712e55b44bfec4d4385d0512f7e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 812bf25183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 05:41:42 +00:00
Samuli Piippo
94cda9406e 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

Change-Id: Ief349b65f59d57c5e0299adb4304278f70da3578
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 810f41bd6a)
2022-08-10 08:41:33 +03:00
Qt Submodule Update Bot
2a5200e485 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I75b1dcd28521d9f8bafaf2764b1a4bde56bbc42b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-10 05:41:23 +00:00
Qt Submodule Update Bot
41ddf0b331 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I15c2d5f38faa522c8565de5953202a007d416f6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-20 22:14:28 +00:00
Qt Submodule Update Bot
b2087eb102 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: If0ef219e34d7c3fddc6174cd8daf8f46ce7de4e7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-19 11:24:13 +00:00
Qt Submodule Update Bot
c312c4932b Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I7c9535eec28165c6c970286b675eb079e128f555
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-18 07:12:38 +00:00
Mikko Gronoff
1742674904 Revert "qtbase: fix rcc build"
This reverts commit adf0acfcd1.

Reason for revert: Fix already included in latest submodule update

Change-Id: If3eebf62c76055f0589aafa912a4875f65afe77f
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-07-18 07:12:19 +00:00
Samuli Piippo
adf0acfcd1 qtbase: fix rcc build
Add patch to fix rcc build:

| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:907: error: undefined reference to 'ZSTD_maxCLevel'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:487: error: undefined reference to 'ZSTD_freeCCtx'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:287: error: undefined reference to 'ZSTD_compressCCtx'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:298: error: undefined reference to 'ZSTD_isError'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:277: error: undefined reference to 'ZSTD_createCCtx'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:294: error: undefined reference to 'ZSTD_compressCCtx'
| /usr/src/debug/qtbase/6.3.2-r0/git/src/tools/rcc/rcc.cpp:300: error: undefined reference to 'ZSTD_getErrorName'
| collect2: error: ld returned 1 exit status

Change-Id: Iaa4d5c4ecb06d5a0244d6a746d5402d23d4ddd0e
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-07-08 06:39:01 +00:00
Qt Submodule Update Bot
62aa75d448 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I49919d0e438f3d9ab8e346c0560d5ce7bc913ffb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-08 06:38:52 +00:00
Qt Submodule Update Bot
1bc4e044bd Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: Ie47a4973146d952df08feaaaf506986d1ce4f92c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-06 05:00:51 +00:00
Samuli Piippo
816bd715ce qtbase: add runtime dependency to vulkan-loader
Dependency to the vulkan-loader need to be runtime to correctly
pull it into the image.

Change-Id: I76be6de10d3515826e16b71444828a043c06970b
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 928a97fd48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-30 11:56:57 +00:00
Qt Submodule Update Bot
c537579b5c Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I4eb36abcc950e1f28300d688f8aae17d7fd0b25e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-28 16:39:16 +00:00
Qt Submodule Update Bot
8f11142840 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I917c131b26e7397b9dfbaddb59b3f58a4a98dc1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-22 05:05:03 +00:00
Samuli Piippo
0e92f84071 sdk: don't define flags for RELEASE build type
The default flags in TARGET_CFLAGS contain '-g' which matches
better to RELWITHDEBINFO build type than RELEASE. Don't define
any build type flags in the toolchain as CMake provides good
default values for each build type.

Change-Id: I6493597f6becf774893386df952c72ab4f66ead2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6672e84e6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-20 13:50:09 +00:00
Qt Submodule Update Bot
97265978f5 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I772cef63af6f8b88eb0aa02a22907eab99acca88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-18 23:17:50 +00:00
Mikko Gronoff
1bf438a6fd qt6-git.inc: Bump PV to 6.3.2
Change-Id: Ia170352b0cef74b50f4b24792772329e6db0c891
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-06-16 11:02:27 +03:00
Martin Jansa
791769a5d9 qtbase: disable tst_qsizef test as well
* fails only on x86
* fails only with gcc-12.1 in langdale
  and doesn't fail with gcc-11.3 in kirkstone
* both kirkstone and langdale builds are using the same binutils-2.38:
  GNU gold (GNU Binutils 2.38.20220516) 1.16

Change-Id: I629c7231fbf29b4ca397a8a5eac72e6101f4cd84
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-06-14 05:55:52 +02:00
Samuli Piippo
b0ff266efb ptest: fix build issue with qtbase tests
ptest build had a subtle problem with qtbase where it was using
Qt6BuildInternals package from native sysroot instead of the target
install path. This could add compiler flags that were not supported
for the target architecture:
  cc1plus: error: '-fcf-protection=full' is not supported for this target

QT_ADDITIONAL_PACKAGES_PREFIX_PATH is not used in qtbase/CMakeLists.txt:
  find_package(Qt6 REQUIRED COMPONENTS BuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
so the current approach for using Qt from the install path was not working.

Change the ptest build from using QT_ADDITIONAL_PACKAGES_PREFIX_PATHs
to using separate cmake toolchain file that prepends the install path
to CMAKE_FIND_ROOT_PATH, which makes CMake find the target Qt packages
correctly.

Change-Id: Idc99a26577886208b85bafe811f61538bb38d5bc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b6a93fbdb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-10 09:30:26 +00:00
Samuli Piippo
aa5af918fd ptest: handle names with spaces
Correctly remove debug file also when directory names have spaces.

Change-Id: Ia1d9efdd72d8f37417f2fd3f3f6d4a2736283ac9
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit faed0e8947)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-08 06:55:27 +00:00
Samuli Piippo
9de3ec80dc SDK: make sure initial qt host path is absolute
__qt_toolchain_initial_qt_host_path is assigned to QT_HOST_PATH and then
to CMAKE_FIND_ROOT_PATH. Problems occurs if that path is relative.
CMake doesn't do relative path resolving by default in find_package,
when doing sub-prefix checking between find root path and prefix path.

Patch the qt.toochain.cmake so that it always uses absolute path for
__qt_toolchain_initial_qt_host_path, but make it still based on its
own location.

Fixes: QTBUG-103818
Change-Id: I1cce126c243c017b1cecd14a0fd616cb0328fe6d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ea541e308f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-06 21:14:50 +00:00
Qt Submodule Update Bot
e3debe117e Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: Ic2f536a4079858dee1e627c94891368cbb9e2dbc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-02 07:16:05 +00:00
Samuli Piippo
c9fa2f1200 qtquickdesigner-components: update revision
Task-number: QDS-6989
Change-Id: If112bad3a15cbc5bdd0cc2e26d561d8bd85acc04
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-05-25 04:54:30 +00:00
Qt Submodule Update Bot
db04b87456 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I5508d96dc01ca3c00b63a6bfa3fb75aee08ba01c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-25 04:54:26 +00:00
Samuli Piippo
bc210937b8 Update handling of commercial modules
Add new packagegroup for all commercial-only Qt addon modules and add
new variable QT_COMMERCIAL_MODULES which can be used to control if the
modules are included in the build. The same variable also turns on the
use of Qt QML Compiler. Use common include file for the commercial modules.

Change-Id: I673a06685b44a5f0f5518ae51bc45956432739a4
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7b0817669a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-23 05:07:32 +00:00
Samuli Piippo
86ae133ab2 sdk: Use correct CMAKE_PREFIX_PATH for Qt modules
Building Qt modules uses extra CMake instructions that try to be clever
about which CMAKE_PREFIX_PATH to use. With SDK, these instructions end
up using the SDK host paths in the device instead of the actual device
paths. Add CMake option to prevent Qt from changing the default prefix.

Fixes: QTBUG-103577
Change-Id: Ia933c843d811e6adb2ed4ede4708f55a6f0e8f0c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ec7e50bbaf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-18 13:02:00 +00:00
Samuli Piippo
a3ba4ebb64 sdk: don't force tool build from sdk
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING has been deprecated in 6.4,
and cross-compiling compile time tools from sdk doesn't make
sense, all runtime tools are still being compiled.

Change-Id: Ia35255e3b84c38342be58b11461a4ee908fba1f9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 73e88c5848)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-18 13:02:00 +00:00
Qt Submodule Update Bot
a1078f7812 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I18cde231b1b7198691676d3a3bfc97d43b17f1f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-18 07:11:17 +00:00
Michal Klocek
b0a06f82c8 Fix bogus env path for qt6 toolchain setup
Use '$ENV{PATH}' otherwise generated file:
sysroots/x86_64-pokysdk-linux/usr/share/cmake/Qt6Toolchain.cmake
ends with:
set(ENV{PATH} "${SYSROOTS}/x86_64-pokysdk-linux/usr/bin:ENV{PATH}")
which breaks find_package calls.

Change-Id: Ieed45ca785ffdc0700f620863c5672e9764d3f8e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b6b180a74f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-13 19:52:29 +00:00
Janne Juntunen
3d8ff0accc qtbase: add option for developer_build feature
Developer_build will include all tests, including private tests,
enabling verification of Qt functionality on target platform.

Change-Id: Icd477958fc7e8144194c5cae3f5b94eebfee6045
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 9036696107)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-13 19:52:29 +00:00
Qt Submodule Update Bot
0a0d9b5271 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I4626a65387376ee808c60be2297f762db6b1fa53
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-13 13:53:19 +00:00
Samuli Piippo
6d90f99c32 qtwebengine: update patch
Change-Id: I9647cba85fd4a9fcd0aadba1273b077b7ae6c844
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 682313136d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-13 13:34:56 +00:00
Samuli Piippo
d783a5790d qtdeclarative: update patch
Change-Id: I356bed7a2cd207383ec83fd8d5f6303f4f92d0e6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4ff7b74454)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-13 13:34:55 +00:00
Samuli Piippo
8ff009e74c Coin: build examples for all modules
Add example build for the missing modules.
Skip qtapplicationmanager due to QTBUG-101508.

Change-Id: Ib01935ac4314f3b97583f032e09fda2966f17549
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6a5ae1effb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-05 19:35:37 +00:00
Samuli Piippo
1cad22bf67 coin: use correct domain for yocto-cache
Change-Id: I830bf9bcaabf954c4f25b380731781e557a134b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a0e53e01e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-03 16:14:57 +00:00
Samuli Piippo
8101a2a4b1 coin: rename the shared sstate-cache
Use DISTRO variable in the sstate-cache directory. This lets use
reused the ci configuration in other distro builds as well.

Change-Id: I51ef6cca7fd938046e5b6510087fc4d62f2a4eb3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e6fba93482)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-03 16:14:49 +00:00
Samuli Piippo
b2894aad5c qtinterfaceframework: fix example packaging
Multiple examples provide the same library which causes packaging failure:
ERROR: qtinterfaceframework-6.4.0-r0 do_package: qtinterfaceframework-examples: Multiple shlib providers for libInstrumentCluster.so

Add the library to PRIVATE_LIBS, since it's only used by the examples.

Change-Id: If09bc7d235171b2b844ec579f6affa6fbe3f8a6d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 90a8c72bed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-28 21:35:36 +00:00
Qt Submodule Update Bot
a8cf585e1f Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: Ib7cd1f00861ea41543eac5b96fa498114f9be347
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-28 03:39:30 +00:00
Samuli Piippo
f719825d8f Coin: add CI build for kirkstone
Add CI build using Yocto kirkstone branches and retire hardknott build
in favor of it. Hardknott is EOL on April 2022. Only dev branch will
continue to be tested against Yocto master.

Change-Id: I9aad0e14c1a5054b2e9eab85ec8a2f2d603f6427
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 670a077467)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-04-27 06:38:29 +00:00