Commit Graph

429 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
ab32c29e4a Update submodule refs on 'lts-6.2.6' in yocto/meta-qt6
Change-Id: Ie1ce3bf80c98df6bdb086648034b6fd38f4d87e7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-20 04:08:06 +00:00
Qt Submodule Update Bot
61c248faeb Update submodule refs on 'lts-6.2.6' in yocto/meta-qt6
Change-Id: If6a7c1f43387cbef3992830a6459dd40040b2db0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-19 08:49:31 +00:00
Mikko Gronoff
b1aad6a270 Switch to 6.2.6 release branch
Change-Id: I5e4bd5f9a5f5876079fbe1e3eea507b117a557f2
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-09-19 11:49:18 +03:00
Samuli Piippo
c4c6cc20da 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)
2022-09-15 07:03:54 +00:00
Samuli Piippo
7b2f8a53bd Revert "qtmultimedia: include only when opengl is available"
The problem has been resolved awhile ago, enable multimedia always.

This reverts commit 7feb5f4a4a.

Change-Id: I8d33f435955c3eeeecc18963f174351f7cfb13c6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-09-12 06:05:49 +00:00
Qt Submodule Update Bot
81e19e1995 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Idee68abd4684d85be55713ae07a523c6ff352e53
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-12 01:30:43 +00:00
Qt Submodule Update Bot
88e591c288 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I64604bb777a9c965a4f8ade9a36509db53a083f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-02 01:52:06 +00:00
Qt Submodule Update Bot
c2628cbafa Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I429291d45db3e6c6d30df2c0d1373d92528e4146
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-30 03:54:55 +00:00
Samuli Piippo
83d3bd799b 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.

Change-Id: Id8a6c4c3b03a850bdb1f99e3a3a08973e134eafc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ee836b7a9f)
2022-08-25 08:46:14 +03:00
Samuli Piippo
45340a8082 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.

Change-Id: I1a5fbac82c4a026b6ba41db3b0cca6a9fbf1e31a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8fb6c082d4)
2022-08-25 08:46:10 +03:00
Qt Submodule Update Bot
50e53d5a75 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I53865f5a78a27d66aa955200889496c748283e95
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-23 14:02:02 +00:00
Samuli Piippo
9567768fa3 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: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-18 10:37:38 +00:00
Samuli Piippo
6b1fa542f6 qmlcompilerplus: add dependency to native
If we stop forcing build of target tools, we then need to have
dependency to the native package.

Change-Id: Ie5d9634ba4c85af877920e66fd88d36880af8afc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8228b69a19)
2022-08-18 10:37:38 +00:00
Qt Submodule Update Bot
8696a99640 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I4e16aeecf22869820295be972797b482a47966b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-18 05:53:43 +00:00
Qt Submodule Update Bot
933622183a Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I8829d05ee5d550abff3af21b29fab3da9dc95ffd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-11 08:33:43 +00:00
Mikko Gronoff
a2a9ba81b7 qt6-git.inc: remove qtspeech from the updated modules list
Qtspeech is not part of 6.2x. Submodule update bot managed to
trigger an update round in a release branch with qtspeech as
a single updated module. Remove the unneeded qtspeech entry to
prevent future issues.

Change-Id: I2ba31ee7d9c77293433af705bf67628009b02ff7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-08-09 11:59:31 +03:00
Qt Submodule Update Bot
aa6d433692 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Ifcfb2863a45d5dbfd85d0918d1214681ff4e897b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-08 02:11:30 +00:00
Qt Submodule Update Bot
2e55fcad17 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I588ee4bcf8a67a84756471360fdfbd7efc9ab160
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-04 04:17:14 +00:00
Qt Submodule Update Bot
91aab69afb Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I4f861a1bca6515572366e66ca8c0ab23f2bd30ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-25 08:33:20 +00:00
Mikko Gronoff
8193106871 qt6-git.inc: Bump PV to 6.2.6
Change-Id: I1e8d23ef8ce50c084e075435d5b55615e903141c
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
2022-07-21 12:51:31 +03:00
Qt Submodule Update Bot
f6c64fa0f8 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I6437841a3c3c8defbba195d4ee534c17624a2e92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-20 02:18:58 +00:00
Qt Submodule Update Bot
1f00475f59 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Id1228e6e59621669dc2de07b7b85ea3a6ab2f527
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-11 05:25:30 +00:00
Samuli Piippo
176e84ced7 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)
2022-07-04 08:37:54 +03:00
Qt Submodule Update Bot
b458bd3a77 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Ife5c885f2188189e59c3b5dbddbf66f397e1fe49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-27 07:39:42 +00:00
Samuli Piippo
073a175a5d 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: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-21 15:46:36 +03:00
Qt Submodule Update Bot
71b5aaad28 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I4319c530164bb698df8127945eeb1c2a545a5235
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-21 07:09:52 +00:00
Samuli Piippo
012bc51f36 Use common variables for both LTS and commercial modules
Define QT_COMMERCIAL_GIT variable in layer.conf and use it in both
LTS and commercial modules.

Change-Id: If9137331236faa8fb78c02f76629cdf17114d230
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 49ee2bdf07)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-06-15 11:17:30 +03:00
Samuli Piippo
4d7ee7fc3a qtwebengine: bring back correct licenses
Amend 72cf04bedb and use the
correct (L)GPL-3.0-only licenses

Change-Id: I4bdbf0e197d003966c5f06eaa94b9ced835e7820
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-06-14 11:21:50 +00:00
Samuli Piippo
72cf04bedb qtwebengine: update to 94-based chromium
QtWebEngine based on 94 chromium can be build with python3.
Remove all references to python2 and its meta layer.

Latest oe-core has version of ICU, freetype, harfbuzz and ffmpeg
that are not compatible with Chromium. Disable those PACKAGECONFIGs
by default.

Cherry-picked without qtpdf which is not supported on lts-6.2.

Change-Id: Ie2e38db14df0f51aaa87ecde7e0487b31be0bddd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 57b22c6ea0)
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-13 10:31:37 +00:00
Samuli Piippo
c51ee614ce qtwebengine: update patch
Change-Id: I9647cba85fd4a9fcd0aadba1273b077b7ae6c844
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 682313136d)
2022-06-13 13:31:30 +03:00
Samuli Piippo
eabb084248 qmlcompilerplus: use from lts branch
Change-Id: I54189a5ff9b7217a4a88449c7f238edb6649d586
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-06-13 10:31:21 +00:00
Qt Submodule Update Bot
7568f697bd Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: If1bb54594f135a1bfa0ffa264e73ff9213e63abb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-13 10:31:13 +00:00
Samuli Piippo
08352251e6 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: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-09 08:20:49 +00:00
Samuli Piippo
f9b57ed9d7 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)
2022-05-24 09:49:59 +03:00
Samuli Piippo
7deb3d8734 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)
2022-05-18 17:47:49 +03:00
Samuli Piippo
a5a07d6a0e 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)
2022-05-18 17:47:49 +03:00
Janne Juntunen
5e1822d67d 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: Janne Juntunen <janne.juntunen@qt.io>
2022-05-18 13:16:16 +03:00
Michal Klocek
244039ef37 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)
2022-05-16 12:09:15 +03:00
Samuli Piippo
56a32f7d8a 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)
2022-05-09 10:19:16 +03:00
Samuli Piippo
2aee7a8de8 coin: use correct domain for yocto-cache
Change-Id: I830bf9bcaabf954c4f25b380731781e557a134b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a0e53e01e0)
2022-05-04 10:41:25 +03:00
Samuli Piippo
381e2420c5 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)
2022-05-04 10:41:20 +03:00
Samuli Piippo
0523ed869b qt6: switch to commercial-only LTS repos and branches
Qt 6.2 is now in LTS phase and changes are available only for
commercial users. Change the repositories to the tqtc-* available
from the codereview using ssh protocol.

Change-Id: I8b4bcba38533dd9ae9530915f69e8353c5ca6956
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-03 20:48:58 +03:00
Samuli Piippo
718ac4d9cd qtspeech: remove recipe
QtSpeech is not officially supported on Qt6 and no support is provided
in the LTS phase. Remove the recipe.

Change-Id: Ief4ab2d21ab1326d3ab79b120b5da311dc2cab66
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-03 20:48:58 +03:00
Mikko Gronoff
07cc88e786 Bump PV to 6.2.5
Change-Id: Ia40d584a9d2155013870646ae7d29270e85bcdd6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-05-03 13:41:34 +03:00
Samuli Piippo
ac964348f6 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)
2022-04-29 09:45:58 +03:00
Samuli Piippo
df7b1d2039 Add support for using LTS repos
The commercial-only LTS releases are available from separate repositories
in codereview using ssh protocol. Qt modules can be switched to using the
LTS version by including the qt6-lts.inc after qt6-git.inc.

Change-Id: I1795e3cad5e758e5de050803bd07c35ab168389a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ff3157ee7e)
2022-04-28 07:39:30 +00:00
Samuli Piippo
839ba6a1c8 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)
2022-04-28 10:39:23 +03:00
Samuli Piippo
3dfa092ad6 qtwebengine: skip host build
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: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-27 07:04:37 +00:00
Samuli Piippo
5f29322cb1 Add details for LTS releases
Change-Id: I30efc2893bb715cc69704f42db20fe1e4727fa55
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit 368fd592da)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-27 10:04:29 +03:00
Samuli Piippo
6215bb4cb6 Revert "qtquickdesigner-components: lower minimum CMake version"
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>
2022-04-11 09:12:18 +00:00