Commit Graph

524 Commits

Author SHA1 Message Date
Mikko Gronoff
15aca17fb4 Update submodule refs to Qt 6.2.8 opensource release
Change-Id: Ic7728af95fd7a27228d3418433e52b9960150c51
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-04-09 08:59:04 +03:00
Mikko Gronoff
b774cbf5c3 Merge tag 'v6.2.8-lts' into '6.2'
meta-qt6 v6.2.8-lts release

Change-Id: I7d63c0d3c306f08d2bd529a197234a82104f7c70
2024-01-11 15:00:59 +02:00
Samuli Piippo
65923d1578 qtwebengine: update to correct revision
Update revision to correct v6.2.7-lts-lgpl release tag.

Change-Id: I5edb575465aac2b334674567ceba67128f27d7f0
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2024-01-08 08:30:28 +00:00
Mikko Gronoff
5752764f85 Update submodule refs to Qt 6.2.7 opensource release v2
Qt 6.2.7 open source content was missing a few license headers, hence
a new update round. Amends commit 8d160af7dd.

Change-Id: Ie8dfded3e8fdd1d965d4f38b8fc7d926c2c5803f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-11-14 11:25:02 +02:00
Mikko Gronoff
8d160af7dd Update submodule refs to Qt 6.2.7 opensource release
Change-Id: I551af218a8955ac75a5ce5417f8269724a811f02
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-26 15:16:49 +03:00
Mikko Gronoff
4e50e99e25 Merge tag 'v6.2.7-lts' into '6.2'
meta-qt6 v6.2.7-lts release

Change-Id: Ic22bf718ec53cd9d8d472e61c14ff430af91885e
2023-09-29 11:23:07 +03:00
Mikko Gronoff
425290b96f qtwebengine: update module revision
Set to correct 6.2.6 sha1.
Amends commit e06231e1c9.

Change-Id: I8991687824b6089b21009b4bef0ec1c576ea0d66
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-09-28 13:54:39 +03:00
Mikko Gronoff
e06231e1c9 Update submodule refs to Qt 6.2.6 opensource release
Change-Id: Id731cd4c7e7364cde481bbabf8a1cb66f8a75327
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-09-26 21:32:53 +03:00
Mikko Gronoff
2838e19ab4 Merge tag 'v6.2.6-lts' into 6.2
Change-Id: I8d90e677ae748a66edb5f89a7063751e248b7925
2023-09-22 10:06:16 +03:00
Qt Submodule Update Bot
c2c2ca9139 Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: I2bf310df2fa038ed0349f49ac52cb7e64438ea79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-11 09:21:19 +00:00
Qt Submodule Update Bot
89491d956e Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: Ib02f889a7e407e5cfdb0d72e0b9392094cfbec94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-06 16:07:37 +00:00
Qt Submodule Update Bot
4cbfb586d2 Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: Icb718dc13ec3163ddc8f847aabf49a222ac4e69b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-03 18:20:42 +00:00
Qt Submodule Update Bot
8fa74407c6 Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: I98e44d84fa8805d4c5a007300b3172cd8a0902de
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-31 09:27:18 +00:00
Qt Submodule Update Bot
979e6a6183 Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: Idf819e0679f2b4da2f1ba2e272302f82cb254948
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-30 11:09:57 +00:00
Mikko Gronoff
e74b63d528 qt6-git.inc: switch modules to 6.2.8 branch
Change-Id: Ib2ff3e453564ac403e901d55950f9b8b5ed9de6f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-30 06:59:09 +03:00
Qt Submodule Update Bot
37399e295e Update submodule refs on 'lts-6.2.8' in yocto/meta-qt6
Change-Id: Iaaeaed1ace001f10dee9aa9c3a5ab2a60ba3bd0e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-30 03:59:08 +00:00
Qt Submodule Update Bot
35035d73b7 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I3c46de8e428ba2ad762562d5f8f8a6ba1a7246f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-28 07:13:15 +00:00
Samuli Piippo
5e7993f6da qtserialbus: socketcan need openembedded layer
Don't enable socketcan PACKAGECONFIG unless openembedded layer
is available.

Change-Id: I54aa0d70014448bf5425ef7a49f9a32e27ba7807
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a4bf9c64e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-27 17:46:36 +00:00
Qt Submodule Update Bot
8b13511443 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: If9a10e093525e9e2bf5e41df471d08fa4c210fbc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-23 11:46:56 +00:00
Andrej Valek
54f20a2143 qt6-git: do not override CVE products
Some components use also base name in NVD CVE database product:
| sqlite> select * from products where product like 'qtbase';
| CVE-2019-18281|qt|qtbase|5.11.0|>=|5.11.3|<=
| CVE-2019-18281|qt|qtbase|5.12.0|>=|5.12.5|<
| sqlite> select * from products where product like 'qtsvg';
| CVE-2021-45930|qt|qtsvg|5.0.0|>=|5.15.2|<=
| CVE-2021-45930|qt|qtsvg|6.0.0|>=|6.2.1|<=

Change-Id: Ic8cbc59522731f49907e10bf08c6a00a213ae006
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d4f4b54f4e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-22 14:37:34 +00:00
Qt Submodule Update Bot
0e12589474 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I4063d289db101de491be971389ba75e49278ae53
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-20 03:30:53 +00:00
Qt Submodule Update Bot
9a6065bd54 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I3011af9c46d0c4638677512dbd86d096eb31be63
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-14 04:08:07 +00:00
Qt Submodule Update Bot
80bded3eb3 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Ibc1f39c1b6ab7fd4e570f00d8b7920a242ba141b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-11 03:43:54 +00:00
Samuli Piippo
760d334c61 Coin: fetch repo from github
Git clones from google fail frequently with:
   >> fatal: early EOF
   >> error: index-pack died
Switch to using github mirror for the git-repo repository.

Change-Id: Id0cbf3c59e50869d62880e56251b003490c4c1ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 61f984c49d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-09 21:26:56 +00:00
Qt Submodule Update Bot
b417bedcae Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I4bdba61564e6b132cff5dfa8a262f16c02684e1e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-08 05:57:55 +00:00
Qt Submodule Update Bot
5ab791d27b Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I064522a590ff013ff69596c4c5ae6a26c5043768
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-23 03:49:15 +00:00
Qt Submodule Update Bot
cc33cee27e Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I31b4829aa8e9f9e5163c9a0b483aaea003a9772a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-20 03:59:08 +00:00
Samuli Piippo
01da39ae48 Update submodule refs to Qt 6.2.5 opensource release
Change-Id: Iab5744d61d0248b890a10ad8f958092b294ca4ce
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-15 08:30:49 +00:00
Samuli Piippo
58801012ad 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-02-15 08:30:41 +00:00
Samuli Piippo
bf5885bc17 coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
2023-02-15 08:30:33 +00:00
Samuli Piippo
dbbb59a2f5 Coin: add branch and repo overrides for lts modules
Until the opensource lts releases are pushed to code.qt.io,
we need to override the git configurations to fetch the modules
from the tqtc repos. This add the same configs as qt6-lts.inc did
when the release was commercial-only, but only for the CI builds.

Change-Id: I789b3600c3aa0a33beeff3cf895944fae51de86c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-15 08:30:25 +00:00
Samuli Piippo
963b7d4d7b Use 6.2 branch
Opensource releases will be merged to 6.2 branch.

Change-Id: I7704d8d6c476afd500f47a6245d3b3dcba23902e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-15 08:30:19 +00:00
Samuli Piippo
252234a0ef Revert "qt6: switch to commercial-only LTS repos and branches"
This reverts commit 0523ed869b.
The LTS releases are pushed to opensource, we again need to
use the public repos and branches.

Change-Id: I1835fcd909773e6219fd3040a97c394ffc6ab327
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-15 08:30:13 +00:00
Samuli Piippo
c3fab4da87 coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-14 15:32:57 +00:00
Qt Submodule Update Bot
fa24d1bda5 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I6a8bfe4f7cd99ef723e23bddeb577d948e128c02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-14 07:05:52 +00:00
Samuli Piippo
a3191d0fd7 Add recipe for QtInsightTracker
QtInsightTracker is a commercial-only module.

Task-number: ANALYTICS-238
Change-Id: I30412dec8552898b76865402c2e2ccfcae8d1904
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 56710e8724)
2023-02-08 13:28:43 +00:00
Qt Submodule Update Bot
836964d756 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I15e78ec0542690ecc60cc8129013a9bcbe28fdd6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-08 03:46:12 +00:00
Qt Submodule Update Bot
c031a903f3 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I7f6dc3187920270f1d899cf2c5468018d19a75a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-04 19:23:58 +00:00
Qt Submodule Update Bot
44ec305512 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I64c86d945580d9b5696279b5ceffffbb6db32a46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-01 12:15:35 +00:00
Samuli Piippo
e944d9b5fe Merge remote-tracking branch 'origin/lts-6.2.5' into 6.2
Change-Id: I32b5f8b0894cbbc3b09f73813794e365fdacc9ee
2023-01-31 12:32:51 +00:00
Samuli Piippo
da6ec2d847 Use global variable for Qt version
Add a global variable that can be used whenever meta-qt6 layer is
included in the build to identify the Qt version.

Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a6f9d2499b)
2023-01-30 12:28:35 +00:00
Samuli Piippo
2e931d2c1d qtbase: use correct path to libdir
Qt might be using different path to libs.

Change-Id: Iaf0721af1c5e74cd293437cb35c287bd820fa3a5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 91a21476ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-20 18:45:42 +00:00
Qt Submodule Update Bot
e668cb59ca Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I75b2d540c443609681f32e0d9e501872c1077abb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-18 22:36:08 +00:00
Samuli Piippo
318784a90a sdk: use security cflags in cmake toolchain file
Keep the SECURITY_CFLAGS set by Yocto builds also in the SKD's
CMake toolchain file. Instead remove only the fortify flags,
since they add unnecessary warnings when doing debug builds
with Qt Creator.

Change-Id: Ia01f92f21c4f68b1be0d57f9a586a34acbe2333c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a942032591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 13:49:09 +00:00
Samuli Piippo
8ee4fe6d88 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-11 19:38:43 +00:00
Samuli Piippo
e395658092 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-11 19:38:42 +00:00
Qt Submodule Update Bot
432c013394 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I03b970ae0a3159174ad6653b1583c0fd846f902f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-05 06:22:42 +00:00
Qt Submodule Update Bot
1217a5ec7d Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: I74d479e9bb8ae7a2a520e04268120979562fa158
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-30 04:06:25 +00:00
Qt Submodule Update Bot
f697689e09 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: If13d78c00b2c8ed92a9617f9b4e71da4a4199a43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-26 03:59:30 +00:00
Qt Submodule Update Bot
567869dfc8 Update submodule refs on 'lts-6.2' in yocto/meta-qt6
Change-Id: Ibf5b2ff1f7d656526024bcc517371696e39bf2a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-21 04:10:39 +00:00