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)
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>
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>
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>
* 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>
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>
__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>
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>
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>
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>
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>
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>
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>
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>
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>
QtWebEngine normally does a host build before the actual
cross-compilation build. We can skip that since during the
cross-compilation, the target binaries are run using QEMU
instead of ones from the host build.
Fixes: QTBUG-102378
Change-Id: I586a68641b48678933ed91a742235c6b22f1d109
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 73927c6db3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The compile time and runtime tools are referenced by CMake files
and if missing from sysroot, it can cause errors suchs as:
| The imported target "Qt6::canbusutil" references the file
|
| "/home/mak/yocto-raspberrypi-latest/build/tmp/work/cortexa53-poky-linux/smartcore/2.2+gitAUTOINC+3970c5b703-r0/recipe-sysroot/usr/bin/canbusutil"
|
| but this file does not exist.
Stage all files in bin and libexec dirs to make sure cmake builds work,
even though the binaries are not actually used during the build.
Fixes: QTBUG-102370
Fixes: QTBUG-97707
Change-Id: I3326e7b8f970952f6d18591204cb78e5a0defcf5
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 9334145f37)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This reverts commit bab800db57.
Fix has been merged to qtquickdesigner-components.
Change-Id: I1ef7d09e3d1c9517aa5c7abbf376cb9bb9422009
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7a4cbf2995)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use shared Hash Equivalence server together with sstate cache.
The Hash Equivalence server can further improve sstate re-use.
Change-Id: I037b565344942cf99c4992e4ff9769fd47d9c77d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9ee589de19)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
