Commit Graph

348 Commits

Author SHA1 Message Date
Samuli Piippo
25bf9d8123 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
e209f4f496 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
fef2b23c08 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
Samuli Piippo
6e6c08bf32 qtbase: update patch
Update patch to apply cleanly again.

Change-Id: I235a321bdf05e6d74871f204dd154929478ecc3c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 28c7a28568)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-15 14:00:31 +00:00
Samuli Piippo
df990437f2 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
a147088213 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
Qt Submodule Update Bot
ca6cede62c Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: If34b474af4b1b84f7835bf6b214df586346bf6e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-12 07:30:40 +00:00
Samuli Piippo
ee85e8f64a 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-10 18:43:39 +00:00
Samuli Piippo
cc4e3412e1 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 18:43:39 +00:00
Samuli Piippo
48caadfe1b qtdeclarative: re-enable ptest
This reverts commit fff02af10d.
Auto test build issue has been fixed.

Change-Id: I55ef6f7aec1a5695089b1fb62e5b6aafb4299d70
Pick-to: dev
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-10 10:43:56 +00:00
Samuli Piippo
5e00e4b5d5 qtapplicationmanager: update revision
Change-Id: I0ad22db23eb4a8574c56845fae2ef239298a56d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-10 12:43:55 +02:00
Samuli Piippo
85e55e5629 Revert "qtbase: fix mingw nativesdk build"
This reverts commit 68bd9cee63.
Proper fix has been merged to qtbase.

Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29
Pick-to: dev
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-10 10:43:54 +00:00
Samuli Piippo
2394565194 qtwebengine: update patch
Change-Id: I4b521099b2283943b893d841c5f2d12e2fbbce01
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-10 12:43:52 +02:00
Qt Submodule Update Bot
e0f125fc25 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I06c173e70ca4fcc0e43d7428a3e3e6594c40d0ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-10 10:43:51 +00:00
Samuli Piippo
4ddc541314 qtbase: remove unneeded patch
Catch2 was updated in qtbase, patch is no longer needed.

Change-Id: I762e27a49ddcc325c5911e36bb65aab24b0b78cb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9080dc9fe0)
2022-02-10 12:43:50 +02:00
Jani Heikkinen
1c4223f70f 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
87c5d8ffcc 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
4d361d1a89 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-02 03:35:34 +00:00
Jani Heikkinen
8b4b1f58c3 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
d6b2ee4fd7 qtpdf: force remove conflicting files
QtPDF does not support static builds, but the build still passes
ok in bitbake builds. Use force when removing the files, since they
don't exists in static builds.

Change-Id: I50cce6e277c25c32aa98804d5f3de6d25df12b25
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit e6fda09a6f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 10:39:45 +00:00
Samuli Piippo
8b362114e9 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 10:39:45 +00:00
Samuli Piippo
281f34393d 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 10:39:45 +00:00
Samuli Piippo
569559bfdd 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 10:39:45 +00:00
Samuli Piippo
dc798b3001 qtdeclarative: disable ptest
ptest compilation fails when using older CMake. Disable until
fixed properly.

Task-number: QTBUG-100314
Change-Id: Ie00e9fe62a1b4f2e94d47eb3d672d27fee7965f5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fff02af10d)
2022-02-01 06:57:18 +00:00
Samuli Piippo
8afa9ef907 qtwebengine: update license checksum
Change-Id: I9e19340b783fefd3cb3ea9d523354e022e131638
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 81daff59ce)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 06:57:12 +00:00
Qt Submodule Update Bot
9b7167a589 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: Id8925ca9dade10163a50017afee63c62287430b0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-01 06:57:06 +00:00
Samuli Piippo
68bd9cee63 qtbase: fix mingw nativesdk build
MinGW runtime libs are missing symbols used in RHI Direct3D.
Include patch until it's merged in qtbase to fix the nativesdk-qtbase
build.

Task-number: QTBUG-100294
Change-Id: I314eb74d52cf28e48ef65fea263d85f2a7978a55
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e7f231a3fb)
2022-01-31 10:21:23 +02:00
Qt Submodule Update Bot
7523899a86 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I248b70d39950b10610fc90fe672748277d3ddb10
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-31 08:21:10 +00:00
Samuli Piippo
1bb7761429 ptest: make sure sources exist
QtDeclarative is building doc snippets as part of the tests and
the sources for those are not in expected location. Test the
source directory before copying them.

Change-Id: Ia3fd214dfc648d221a7b8bb6ec24e3cd3f698049
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b75a4f9dfb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-27 10:37:57 +00:00
Samuli Piippo
ade815ea65 qtlanguageserver: use correct license file
Pick-to: dev
Change-Id: I67a63defb9fa254f1d74c95eb8d80e502cff8316
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-26 09:30:19 +02:00
Samuli Piippo
26ea50356c qtbase: update patch to apply cleanly
Pick-to: dev
Change-Id: I45b21135b5f2c9e3f48310b4ac29961b2dcc0109
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-26 09:30:09 +02:00
Samuli Piippo
caf7c87b41 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 20:18:06 +00:00
Samuli Piippo
8a8f0d0d10 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:36:00 +00:00
Samuli Piippo
bfc176cd5e 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
30fbe7d772 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 13:15:51 +00:00
Samuli Piippo
1fc6e71ad1 Add support for qtlanguageserver
Implementation of the Language Server Protocol which is used by
QtDeclarative to provide QML language server.

Fixes: QTBUG-99780
Change-Id: I600ca8c6738d7b9aba8d275edb85f642aee7eb47
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ddce6334cf)
2022-01-18 10:52:47 +02:00
Mikko Gronoff
7001d83524 qtdatavis3d: update license & lic_files_chksum
Leftover from earlier license update change. Amends
commit b7437b7c2f.

Change-Id: Ia566c9cddc51d123fe5ee38c0204ce2fae656148
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 869ec52ee2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-17 23:34:01 +00:00
Mikko Gronoff
b25e739420 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.

Change-Id: I1481dacf7e8da594866ebba13a5fa44f167562d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b7437b7c2f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-14 11:00:55 +00:00
Qt Submodule Update Bot
b406bcc5a0 Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: I8f3200025b0371a5682337b72c8e55e85ad832bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-14 05:18:43 +00:00
Samuli Piippo
801c33c8df 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
eb0a848094 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 16:41:18 +00:00
Samuli Piippo
b1ca57e68a 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 16:41:18 +00:00
Qt Submodule Update Bot
1bfc47178f Update submodule refs on '6.3' in yocto/meta-qt6
Change-Id: Ic31e2d26a83647b2d43588eedb3bf4155a667a9e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-11 11:30:02 +00:00
Samuli Piippo
d7d1e9d66f qtbase: remove merged patch
Pick-to: dev
Change-Id: I92ffeaad0204a7ff3b27a76837bfa618bc2e9970
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-11 11:29:48 +00:00
Samuli Piippo
0d2f6465e0 qttranslations: remove qtquickcontrols2
Translations for qtquickcontrols2 were merged to qtdeclarative.

Pick-to: dev
Change-Id: I287253d23fbd6c22eb68145f0ed94de0338a48e8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-11 13:29:28 +02:00
Samuli Piippo
850937df48 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.

Change-Id: Ie2e38db14df0f51aaa87ecde7e0487b31be0bddd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 57b22c6ea0)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-12-31 15:43:42 +02:00
Mikko Gronoff
0a797d9888 README.md: update CI test build matrix
Add 6.3 branch.

Change-Id: I830b750f783308fee0b856663ffb15c4bcc0aaea
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 94f562c5df)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-31 09:29:11 +00:00
Mikko Gronoff
da80b30704 qt6-git.inc: change default branch dev -> 6.3
Change-Id: I56debb51a46be414a209d9c73703456db4d46d1b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-30 14:36:04 +02:00
Mikko Gronoff
b721265a72 qtbase: add patch to fix declarative build issue
Add (pending) upstream patch for QTBUG-99316 to fix declarative
build issue on latest submodule update.

Change-Id: Iac5bae13374c7de32efa61bdf9b8f69c6d652b0f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit c9d0d37cfb)
2021-12-30 14:36:04 +02:00
Mikko Gronoff
dd5a54b3a7 Update license checksums
With latest submodule update, several modules
got licenses removed and/or added & updated.
Update LIC_FILES_CHKSUM field in recipes to
match the updates.

Change-Id: Ic0c7c65c92bf515dbf510f5c988f92446bf76dc2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 5909c76dc1)
2021-12-30 14:36:04 +02:00