Commit Graph

358 Commits

Author SHA1 Message Date
Samuli Piippo
1625dbe18d qtinterfaceframework: update workaround for kirkstone
Skip qtinterfaceframework also with kirkstone now that master
branch is using kirkstone as DISTRO_CODENAME.

Change-Id: I8ff7c9c3289d4f2c8864c14a6abcf61fe34250a6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b32b7f2774)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-16 14:31:38 +00:00
Qt Submodule Update Bot
faaa75bd95 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Ie83d625e9e68e54ebacc86c3d7789182046b544b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-14 19:15:25 +00:00
Qt Submodule Update Bot
6570dc7764 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Ie7ccf01b76357b96e93a0027ceeb7f2e9b1e2268
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-11 18:15:23 +00:00
Samuli Piippo
ea7726a0df Create Conan profile
Generate Conan profiles that can then be used with the SDK.
Task in qtbase generates profile that has all the architecture bits
and configure arguments in place. The profile added in the SDK phase
lets Conan recipes know how to use the SDK with the QT_CONFIGURE_MODULE
environment variable.

Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit a64c978983)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-10 10:51:57 +00:00
Samuli Piippo
f41e3d3139 sdk: resolve absolute paths in toolchain file at runtime
MinGW toolchain doesn't perform relocation during installation,
so all the absolute path point to the temporary sdk paths.
Use the location of the toolchain file to get the absolute
paths at runtime instead instead of using external SDKPATH
env for it.

Change-Id: I699b2178baf5cc855a57186056341b6c6eefbbf5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0ef2348d49)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-03-09 13:07:24 +02:00
Samuli Piippo
9d5672ebda sdk: rewrite cmake toolchain file without environment variables
The default OEToolchainConfig.cmake uses environment variables
to set all the cmake variables in place. The Qt6Toolchain.cmake
chainloaded the same toolchain file after setting everything to env.

Rewrite the Qt6Toolchain.cmake now to set all the cmake variables
directly without using environment variables or chainloading
the origin OEToolchainConfig.cmake.

This allow better integration to QtCreator that might be used
to modify the compiler flags for projects.

Change-Id: I7c7c42ec17c86f53b62ed557d9b61d5d19abc1e0
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5cbac6cf35)
2022-03-09 13:07:12 +02:00
Qt Submodule Update Bot
81d0697967 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: I1ec7b7f1aa1a0709ba32b8d49fd76a83d823e019
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 17:33:26 +00:00
Samuli Piippo
b24cb95edc Revert "qtbase: add patch for cross-compilation build"
This reverts commit e31b6352a0.
The patch was merged into qtbase.

Change-Id: I0b342b99cd97a71f358f9e57dee53634e2972de5
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-08 13:47:36 +02:00
Qt Submodule Update Bot
34020d241f Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: I61eaa91d9e05c8455f272750943ec760c187ee89
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 11:47:36 +00:00
Samuli Piippo
aa5a70f0ba licenses: add SPDX license mapping to old license names
The common license files have been renamed to use SPDX names, but we
still support some older yocto branches that use the old names.
Add mapping to allow building with older yocto version after the
recipes are updated to the new license names. This avoid warnings:
No generic license file exists for: GPL-3.0-only in any provider

Change-Id: Ib93baf9027442e69ab5bce294449bd203d9be2aa
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f80f96848d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-08 07:16:19 +00:00
Martin Jansa
b1b08aa40f meta: update license names
* openembedded-core/scripts/contrib/convert-spdx-licenses.py .
  ...
  All files processed with version 0.01

Change-Id: Ife671a597eea9e1567d2b37d0aea25cc0b8e9012
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d26bf4af06)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-08 09:16:13 +02:00
Samuli Piippo
44966f276a srcrev_update: fix update task with latest fetcher
Additional check was added into the bb.fetcher that needs to be
workaround in srcrev_update task. Otherwise task will fail with
error:

Exception: bb.fetch2.FetchError: Fetcher failure: Recipe uses a
floating tag/branch without a fixed SRCREV yet doesn't call
bb.fetch2.get_srcrev() (use SRCPV in PV for OE).

Change-Id: Ib3c2665257c344c312074519a03d96437866cd8d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6492c16955)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-05 10:05:17 +00:00
Samuli Piippo
a476f413c6 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
6a9e4eb48e 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-24 15:46:39 +00:00
Samuli Piippo
94d47588e0 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-24 15:46:33 +00:00
Samuli Piippo
20b5fb31c7 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-24 15:46:26 +00:00
Mikko Gronoff
e31b6352a0 qtbase: add patch for cross-compilation build
Add patch that amends cmake related change included in latest
submodule update.

Change-Id: Ifdba80854f28277d40bc245e7a01eac9b7bc4998
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-21 10:33:45 +02:00
Mikko Gronoff
89ba83fa7a qtwebview: update license & checksums
Pick-to: dev 6.3 6.2.4
Change-Id: I061c2c6a2267fea2bb8c613de2da0c33a5059446
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-21 08:33:33 +00:00
Mikko Gronoff
e0436d24f3 qtbase: update license agreement checksum
Pick-to: dev 6.3 6.2.4
Change-Id: I76d6a0a4576d3a8430060d42845e4ca4b5fd7219
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-21 08:33:12 +00:00
Qt Submodule Update Bot
b4dc956230 Update submodule refs on '6.2' in yocto/meta-qt6
Change-Id: Iee18d0bbe3878939791d3033162a9826960222c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-21 08:32:57 +00: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