Commit Graph

348 Commits

Author SHA1 Message Date
Samuli Piippo
3890ffe5e1 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-13 08:54:47 +00:00
Qt Submodule Update Bot
f52e491cd9 Update submodule refs on '6.2.4' in yocto/meta-qt6
Change-Id: I5b443e52b5ccc3f0d3ac237b3e7120331e651f97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 00:59:13 +00:00
Mikko Gronoff
fa6561d871 qtwebview: update license & checksums
Change-Id: I061c2c6a2267fea2bb8c613de2da0c33a5059446
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 89ba83fa7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-04 11:30:56 +00:00
Mikko Gronoff
c3426d0ea7 qtbase: update license agreement checksum
Change-Id: I76d6a0a4576d3a8430060d42845e4ca4b5fd7219
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit e0436d24f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-04 11:30:44 +00:00
Qt Submodule Update Bot
6567b5f2d3 Update submodule refs on '6.2.4' in yocto/meta-qt6
Change-Id: I0e1af6bedd44c5260ec260209a89e6c7efb8fad3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-04 11:30:26 +00:00
Samuli Piippo
4412ebabc0 layer: use the same priority as the core layer
Some of the python3 recipes we carry are already in meta-python
layer, but not in all the branches that we support. In order to use
the most recent recipe, we need to have same or lower BBFILE_PRIORITY
than meta-python. Depending on the branch, meta-python's priority is
either same or higher than the core layer's priority.

Change-Id: I98c74858c5be69e45a76a45ed10aa1168c614618
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d36033ca56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-03 14:29:58 +00:00
Samuli Piippo
9de5efd9a2 layers: Bump to use kirkstone
Fixes: QTBUG-101142
Change-Id: I85c5dbbfc10184108514dd01a3255018c0dc3db4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3ff5acc752)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-25 10:51:10 +02:00
Samuli Piippo
c949bce36d Coin: adapt to variable renaming
In kirkstone, some of the variable have been renamed to
use inclusive language.

Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2d4825f309)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-25 10:51:01 +02:00
Samuli Piippo
85ce2deaf5 Coin: use include files for configuration
Restructure the Coin build configs so that all configurations
are already in .inc files that can be easily included.

Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0708a33ea6)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-25 10:50:52 +02:00
Mikko Gronoff
1fd4cdc7fa qt6: update branch to 6.2.4
Change-Id: Ic54e91c6ec727ec7c4ea497d2336dab74c86c4e8
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-25 10:50:31 +02:00
Samuli Piippo
faa4646b30 qtquickdesigner-components: add dependency to native-qtdeclarative
native-qtdeclarative is needed to take advantage of qmlcachegen
and qml script compiler.

Change-Id: Ie78b3401a1f4dfe252970f8c0b1dea70c0c0c954
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9471cb966f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-14 16:04:45 +00:00
Samuli Piippo
2d5228e95b sdk: workaround failing nativesdk-python3-qface build
meta-openembedded/master has issues building certain python3
modules for nativesdk. For python3-qface, failure is from dependency
chain: nativesdk-python3-qface
 -> nativesdk-python3-watchdog
  -> nativesdk-python3-requests
   -> nativesdk-python3-pyopenssl
    -> nativesdk-python3-cryptography

Don't include qtinterfaceframework to sdk when using master branch
with poky until all modules can be built correctly.

Change-Id: Id2837f1363a22cb28e45c1165631cfa3f37756a7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b2ccd0bd60)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-14 16:04:45 +00:00
Samuli Piippo
5da8552ecc licenses: be explicit about BSD license
All references here to BSD actually mean BSD-3-Clause.

Change-Id: Iec43070c5245d053259c215311f238989741c85d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 154c396c57)
2022-02-11 17:54:57 +02:00
Samuli Piippo
96c29ca26e Revert "qtwebengine: disable webrtc-pipewire support"
This reverts commit d19c1d8cf9.
The issue has now been fixed.

Change-Id: Id5fad9cb5eadc04441ae6963b90f482cbe10911d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-11 17:54:43 +02:00
Samuli Piippo
46e7451091 qtwebengine: update patch
Change-Id: I4b521099b2283943b893d841c5f2d12e2fbbce01
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2394565194)
2022-02-11 17:54:32 +02:00
Samuli Piippo
025fcd937f qtapplicationmanager: update revision
Change-Id: I072d8f155612684563da9ad4c7912d6b1340489f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-11 17:54:17 +02:00
Qt Submodule Update Bot
8514145884 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Ia6853ecd12c2f929dcac9dd9ab0a53551124b911
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-11 15:54:11 +00:00
Samuli Piippo
2a751aeeb1 sdk: use relativate path with cmake toolchain file
Paths in mingw toolchain are not relocated when installed, so we
need to use relative path for the Qt6Toolchain.cmake file.

Fixes: QTBUG-100642
Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e78c281c0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-10 13:45:39 +00:00
Mikko Gronoff
2c6531dbfe qtquickdesigner-components: update module
Update to latest revision in dev branch.

Change-Id: If12c3f3071f208c2ab1e1a5d63697b2e9a071c57
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e4e5b75e22)
2022-02-10 09:51:16 +02:00
Jani Heikkinen
254c53abcd Fix a bug in LA 4.4
Fixes: QTPMO-1479
Change-Id: I86eefc98ad663141de840d54d713ef029ee28291
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 92b8d16b73)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-09 19:15:11 +00:00
Samuli Piippo
760d826ee1 qtwebengine: skip QA issue
Fix QA Issue: qtwebengine: ELF binary /usr/lib/libQt6WebEngineCore.so.6.2.4
has relocations in .text [textrel]

Change-Id: I46fae1212efa0680cec2bfbc29f21800195176d2
(cherry picked from commit 57b22c6ea0)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-09 09:08:41 +02:00
Samuli Piippo
d50f63cea7 Coin: build webengine without system ffmpeg
oe-core/master has incompatible ffmpeg version, instead use the
chromium's own version.

Change-Id: Ic14b85d6f07fd538c18bbb97647fb9bc9c923cb9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-09 09:08:34 +02:00
Samuli Piippo
f369aa3f3b Coin: use manifest to fetch meta layers
Use manifests to fetch meta layer repositories. This enables
us to easily pin the upstream layers to specific revision if
and when the latest revision gets broken.

Build again against master branch, the manifest is pinned to
working meta-openembedded revision.

Change-Id: I5d217f6932aaf5eaacae8ccbc790ea31aaa27f37
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 688791f03d)
2022-02-09 09:08:21 +02:00
Samuli Piippo
ee7f7bed4a ptest: allow ptest to be disabled for all Qt modules
For static Qt builds, it's useful to allow disabling ptest for all
Qt modules without removing ptest from DISTRO_FEATURES, since that
would cause rebuild of most of the system components.

Change-Id: I32aa202ce8e4a1260e287b0625495ef828536511
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a730a1f029)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 11:44:22 +00:00
Samuli Piippo
9080dc9fe0 qtbase: remove unneeded patch
Catch2 was updated in qtbase, patch is no longer needed.

Pick-to: dev 6.3
Change-Id: I762e27a49ddcc325c5911e36bb65aab24b0b78cb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-03 15:08:00 +02:00
Samuli Piippo
06231d781a qtwebengine: update license checksum
Change-Id: I9e19340b783fefd3cb3ea9d523354e022e131638
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 81daff59ce)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-03 15:07:59 +02:00
Qt Submodule Update Bot
2b106b5871 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Id4a8302bebe9fc15eb6f682bffc95d2853acab77
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-03 13:07:58 +00:00
Samuli Piippo
d19c1d8cf9 qtwebengine: disable webrtc-pipewire support
Temporarily disable support for webrtc-pipewire feature due
to QTBUG-100435.

Change-Id: I77191b7c9ed6fd8f598191e37517985263e41281
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-03 13:07:57 +00:00
Jani Heikkinen
3679fa9b0e Update The-Qt-Company-Commercial
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Change-Id: I3b2086857e7c9b9cf7d44a40c080ae6bd03ca927
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7017b2f1f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 17:18:30 +00:00
Samuli Piippo
0370a1bda5 qtinterfaceframework: fix packaging for static builds
In static builds, we can't have the extra simulation and refapi packages
first on the list, since the static libs would end up there as well.
Use PACKAGE_BEFORE_PN to add the packages in proper order.

Change-Id: I35976b90b12137caa7b7044f4aef40c229c75783
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 7e1e9f892e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 09:33:21 +00:00
Samuli Piippo
0f6de61a4b qt6-cmake: inherit pkgconfig
Static build needs pkgconfig for every Qt module. Include it already
in qt6-cmake class instead of in each individual module.

Change-Id: I065382ee49d6b40b76ede9e632d17221451de8d1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit cbac31ee90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 09:33:21 +00:00
Samuli Piippo
c800414eba qt6: add packaging rule for static plugins
Change-Id: I7f511470d3de6ae25eb4631de38b18fe347bcdfd
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit c8499a81b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 09:33:21 +00:00
Mikko Gronoff
81878a43b4 qt6-git.inc: Bump PV to 6.2.4
Change-Id: I09b7433685e7a40e0d5efe152c1ba1237366696a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-28 08:15:53 +02:00
Samuli Piippo
d188d422e8 qt6-cmake: remove unncessary directory separator
Change-Id: Ie4ced4340bcf672cfbf7f034283beb53c93dbd92
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 17c05714ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-20 22:41:42 +00:00
Mikko Gronoff
1c9ac4ace1 qtdatavis3d: update license
Leftover from earlier license update change. Amends
commit 21a91d465d.

Pick-to: 6.2.3
Change-Id: I0117fe38773d39f358475378030e017edabe0a17
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-20 22:07:31 +02:00
Qt Submodule Update Bot
6a1b0efcaa Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Ieb2e261738bf901ea1ef907e16db124a9202fcf1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-20 14:56:21 +00:00
Samuli Piippo
cf55d9d527 qtmultimedia: add dependency to qtsvg for examples
Some examples have dependency to Qt SVG.

Change-Id: I9084c4a4e321710aa60a6e5df351b37c3c1518cb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a6e5979a1b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-20 14:56:21 +00:00
Samuli Piippo
5bfd174e39 Coin: disable CI build against upstream master
meta-openebedded is currently broken due to nativesdk-python3-cryptography.

Change-Id: I99fa9313c1c8d1196bc09a8755269ecffe75ce56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3da9ed068a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-20 10:18:54 +00:00
Samuli Piippo
6364361d88 sdk: don't filter nativesdk packages with DISTRO_FEATURES
The nativesdk builds have different set of DISTRO_FEATURES, which
by default don't include wayland, even if it's used for target builds.
Instead of filtering wayland packages based on the DISTRO_FEATUREs,
always include them. The nativesdk packages builds correctly, even if
wayland is not supported for the target.

Fixes: QTBUG-99787
Change-Id: I9e00b5e4eacc340a985d0617911c02144ec3e6ed
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a03cfa981d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-18 12:14:11 +00:00
Mikko Gronoff
5936d6e7a6 qtquickdesigner-components: update module
Update to latest revision in dev branch.

Change-Id: I0518f52a12f6142ccba157785c80feaa2c14c840
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d56d65c8b8)
2022-01-17 09:59:08 +02:00
Mikko Gronoff
21a91d465d qt6: Update license clauses
Previous submodule update brought in license file
updates for several modules, removing obsolete ones
and adding missing ones. Update license clauses for
the modules to match current licensing.

* Cherry-pick adaptations for 6.2 branch:
  qtserialbus & qtshadertools updates omitted
  as those are not applicable in 6.2 branch

Change-Id: I1481dacf7e8da594866ebba13a5fa44f167562d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b7437b7c2f)
2022-01-17 09:58:56 +02:00
Samuli Piippo
5a4b38abc2 Move generated qmltypes files to dev packages
The qmltypes describe the plugin-supplied types contained in the library.
They are used for QML tooling purposes only. Move them to the dev package.

Change-Id: I8aad69d0cda9564651ddadc2a3d2d0434250b742
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 97899416ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-13 22:23:12 +00:00
Samuli Piippo
6ebbdc2a17 sdk: use Qt's own qt.toolchain.cmake in build scripts
qt-cmake* helper build scripts by default use Qt's generated
qt.toolchain.cmake as the CMAKE_TOOLCHAIN_FILE. Keep this behavior and
patch qt.toolchain.cmake so that will chain-load our Qt6Toolchain.cmake.

qt.toolchain.cmake includes bits that are needed for the conan
integration to work correctly with the sdk.

Change-Id: I89a5e152324178151ba8a5ab4734d542fa4c995c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7f3cb3884d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-11 15:09:26 +00:00
Samuli Piippo
aa6c687f75 qtvirtualkeyboard: inherit pkgconfig
Newer oe-core doesn't pull many default dependencies anymore:
https://lists.openembedded.org/g/openembedded-core/message/156185
add explicit dependency on pkgconfig through pkgconfig.bbclass as
we're using it here.

Fixes:
| ERROR: Feature "hunspell": Forcing to "ON" breaks its condition:
|     QT_FEATURE_3rdparty_hunspell OR QT_FEATURE_system_hunspell
| Condition values dump:
|     QT_FEATURE_3rdparty_hunspell = "OFF"
|     QT_FEATURE_system_hunspell = "OFF"

Change-Id: I5f05e2e249ef52402626ee3469f32b0c05d58cb5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0e598fb241)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-11 15:09:26 +00:00
Qt Submodule Update Bot
58b77cff2d Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Idf3026f8df680543b9c40902efce340ec0d547ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-05 02:18:12 +00:00
Qt Submodule Update Bot
be4ac9af6c Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: I6fcbb327ef7c92f05059abb23c19c3f62f5b0dde
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-04 00:17:49 +00:00
Martin Jansa
4f28e05494 qtinterfaceframework: inherit pkgconfig
Newer oe-core doesn't pull many default dependencies anymore:
https://lists.openembedded.org/g/openembedded-core/message/156185
add explicit dependency on pkgconfig through pkgconfig.bbclass as
we're using it here.

Fixes:
| ERROR: The taglib submodule was not initialized
| Please initialize the submodule
| E.g. by running the following command:
|     git submodule init && git submodule update
|
| or disable taglib by passing --taglib=no

Change-Id: I1038a755d12e8f918a8b44646b241b0b807da86c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b38b4c77ce)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-12-29 14:16:29 +02:00
Pasi Petäjäjärvi
2a5b08abdb QtApplicationManager: Add support
Adds Qt Application Manager module

Task-number: QTBUG-94105
Change-Id: I536b088c69b7ace484fbeef8e8a0e8136a1abacc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 082551ef78)
2021-12-29 12:35:24 +02:00
Pasi Petäjäjärvi
7b9b54e5d3 QtInterfaceFramework: Add support
Adds Qt Interface Framework module.

Task-number: QTBUG-94105
Change-Id: I3f8a1caf251e2e6b8be55e78361a3e0f2b95fca4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d4572bf1b9)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-12-29 10:56:34 +02:00
Jeroen Hofstee
8927654c3e qt6-qmake: use the OE_QMAKE bindir and libexecdir
The bindir and libexecdir can be set to a different directory. Since
qmake and tools were searched for in the normal native staging bindir
and libexec dir, they would not be found. So use the OE_QMAKE version
of them instead.

Change-Id: I834bded248a79a6f0d18c6a32b4230f44ddf6a64
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit af73962f3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-29 07:40:46 +00:00