Commit Graph

345 Commits

Author SHA1 Message Date
Samuli Piippo
0708a33ea6 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.

Pick-to: 6.3 6.2
Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-24 09:36:33 +00:00
Samuli Piippo
28c7a28568 qtbase: update patch
Update patch to apply cleanly again.

Pick-to: 6.3
Change-Id: I235a321bdf05e6d74871f204dd154929478ecc3c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-15 10:25:52 +02:00
Samuli Piippo
b2ccd0bd60 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.

Pick-to: 6.3 6.2
Change-Id: Id2837f1363a22cb28e45c1165631cfa3f37756a7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-14 07:17:15 +00:00
Samuli Piippo
9471cb966f qtquickdesigner-components: add dependency to native-qtdeclarative
native-qtdeclarative is needed to take advantage of qmlcachegen
and qml script compiler.

Pick-to: 6.3 6.2
Change-Id: Ie78b3401a1f4dfe252970f8c0b1dea70c0c0c954
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-14 07:17:02 +00:00
Qt Submodule Update Bot
96de92b5cb Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I832aefbdc0375442cec247eb70e8397084aa1fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-12 11:50:40 +00:00
Samuli Piippo
c537067d9a qtdeclarative: re-enable ptest
This reverts commit fff02af10d.
Auto test build issue has been fixed.

Change-Id: I55ef6f7aec1a5695089b1fb62e5b6aafb4299d70
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 48caadfe1b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-11 13:18:21 +00:00
Samuli Piippo
c40d7810c6 Revert "qtbase: fix mingw nativesdk build"
This reverts commit 68bd9cee63.
Proper fix has been merged to qtbase.

Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 85e55e5629)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-11 15:18:08 +02:00
Samuli Piippo
df191c5ccf 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-11 15:18:04 +02:00
Samuli Piippo
b5d908c8a8 qtwebengine: update patch
Change-Id: I4b521099b2283943b893d841c5f2d12e2fbbce01
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2394565194)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-11 13:17:55 +00:00
Samuli Piippo
e406469ad3 qtapplicationmanager: update revision
Change-Id: Icd7d5f65244ea5b941a77b21b1aa8094a72fac4c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-02-11 15:17:43 +02:00
Qt Submodule Update Bot
2c546124d5 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I6ece10557997ffd9d67aaa94a21dfd9663e6195e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-11 13:17:38 +00:00
Samuli Piippo
154c396c57 licenses: be explicit about BSD license
All references here to BSD actually mean BSD-3-Clause.

Pick-to: 6.3 6.2
Change-Id: Iec43070c5245d053259c215311f238989741c85d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-10 09:26:57 +02:00
Samuli Piippo
e78c281c0a 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
Pick-to: 6.3 6.2
Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-10 09:26:51 +02:00
Jani Heikkinen
92b8d16b73 Fix a bug in LA 4.4
Fixes: QTPMO-1479
Pick-to: 6.3 6.2
Change-Id: I86eefc98ad663141de840d54d713ef029ee28291
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-09 20:16:50 +02:00
Mikko Gronoff
e4e5b75e22 qtquickdesigner-components: update module
Update to latest revision in dev branch.

Pick-to: 6.3 6.2
Change-Id: If12c3f3071f208c2ab1e1a5d63697b2e9a071c57
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-09 11:54:47 +02:00
Samuli Piippo
a730a1f029 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.

Pick-to: 6.3 6.2
Change-Id: I32aa202ce8e4a1260e287b0625495ef828536511
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-04 05:33:30 +00:00
Samuli Piippo
688791f03d 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.

Pick-to: 6.3 6.2
Change-Id: I5d217f6932aaf5eaacae8ccbc790ea31aaa27f37
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-01 19:18:25 +02:00
Jani Heikkinen
7017b2f1f6 Update The-Qt-Company-Commercial
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Pick-to: 6.3 6.2
Change-Id: I3b2086857e7c9b9cf7d44a40c080ae6bd03ca927
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-01 12:01:33 +02:00
Samuli Piippo
e6fda09a6f 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.

Pick-to: 6.3
Change-Id: I50cce6e277c25c32aa98804d5f3de6d25df12b25
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-01 06:01:05 +00:00
Samuli Piippo
c8499a81b5 qt6: add packaging rule for static plugins
Pick-to: 6.3 6.2
Change-Id: I7f511470d3de6ae25eb4631de38b18fe347bcdfd
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-01 06:00:59 +00:00
Samuli Piippo
7e1e9f892e 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.

Pick-to: 6.3 6.2
Change-Id: I35976b90b12137caa7b7044f4aef40c229c75783
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-01 06:00:53 +00:00
Samuli Piippo
cbac31ee90 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.

Pick-to: 6.3 6.2
Change-Id: I065382ee49d6b40b76ede9e632d17221451de8d1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-01 06:00:46 +00:00
Samuli Piippo
d6a37cc62e qt6: bump version to 6.4.0
Change-Id: Ic8538c3d961c7b83bf1cbbebd097313a9e9f7070
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-01 08:00:34 +02:00
Qt Submodule Update Bot
34d5da001d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ic9ef9cb0ae55531069ff61de8d6b2be89df4e08a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-31 06:53:12 +00:00
Samuli Piippo
81daff59ce qtwebengine: update license checksum
Pick-to: 6.3 6.2
Change-Id: I9e19340b783fefd3cb3ea9d523354e022e131638
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-31 08:53:00 +02:00
Samuli Piippo
fff02af10d 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>
2022-01-31 08:52:42 +02:00
Samuli Piippo
6a6937d2a9 qttranslations: remove qtquickcontrols2
Translations for qtquickcontrols2 were merged to qtdeclarative.

Change-Id: I287253d23fbd6c22eb68145f0ed94de0338a48e8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0d2f6465e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-31 06:52:20 +00:00
Samuli Piippo
e7f231a3fb 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.

Pick-to: 6.3
Task-number: QTBUG-100294
Change-Id: I314eb74d52cf28e48ef65fea263d85f2a7978a55
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-31 08:52:04 +02:00
Samuli Piippo
0c1640e2c3 qtbase: remove merged patch
Change-Id: I92ffeaad0204a7ff3b27a76837bfa618bc2e9970
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d7d1e9d66f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-31 06:51:52 +00:00
Samuli Piippo
b75a4f9dfb 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.

Pick-to: 6.3
Change-Id: Ia3fd214dfc648d221a7b8bb6ec24e3cd3f698049
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-27 08:31:13 +02:00
Samuli Piippo
a3cf192180 qtlanguageserver: use correct license file
Change-Id: I67a63defb9fa254f1d74c95eb8d80e502cff8316
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ade815ea65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-26 12:46:05 +00:00
Samuli Piippo
a4d9478187 qtbase: update patch to apply cleanly
Change-Id: I45b21135b5f2c9e3f48310b4ac29961b2dcc0109
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 26ea50356c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-26 12:46:05 +00:00
Samuli Piippo
17c05714ad qt6-cmake: remove unncessary directory separator
Pick-to: 6.3 6.2
Change-Id: Ie4ced4340bcf672cfbf7f034283beb53c93dbd92
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-20 15:56:15 +02:00
Samuli Piippo
3da9ed068a Coin: disable CI build against upstream master
meta-openebedded is currently broken due to nativesdk-python3-cryptography.

Pick-to: 6.3 6.2 6.2.3
Change-Id: I99fa9313c1c8d1196bc09a8755269ecffe75ce56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-20 10:00:19 +02:00
Samuli Piippo
a6e5979a1b qtmultimedia: add dependency to qtsvg for examples
Some examples have dependency to Qt SVG.

Pick-to: 6.3 6.2
Change-Id: I9084c4a4e321710aa60a6e5df351b37c3c1518cb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-18 17:27:07 +02:00
Samuli Piippo
a03cfa981d 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.

Pick-to: 6.3 6.2 6.2.3
Fixes: QTBUG-99787
Change-Id: I9e00b5e4eacc340a985d0617911c02144ec3e6ed
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-18 09:52:34 +02:00
Mikko Gronoff
869ec52ee2 qtdatavis3d: update license & lic_files_chksum
Leftover from earlier license update change. Amends
commit b7437b7c2f.

Pick-to: 6.3
Change-Id: Ia566c9cddc51d123fe5ee38c0204ce2fae656148
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-17 16:01:25 +02:00
Samuli Piippo
ddce6334cf Add support for qtlanguageserver
Implementation of the Language Server Protocol which is used by
QtDeclarative to provide QML language server.

Fixes: QTBUG-99780
Pick-to: 6.3
Change-Id: I600ca8c6738d7b9aba8d275edb85f642aee7eb47
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-17 10:39:21 +02:00
Mikko Gronoff
d56d65c8b8 qtquickdesigner-components: update module
Update to latest revision in dev branch.

Pick-to: 6.3 6.2 6.2.3
Change-Id: I0518f52a12f6142ccba157785c80feaa2c14c840
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-14 13:59:30 +02:00
Mikko Gronoff
b7437b7c2f 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.

Pick-to: 6.3
Change-Id: I1481dacf7e8da594866ebba13a5fa44f167562d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-14 08:41:25 +02:00
Samuli Piippo
97899416ec 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.

Pick-to: 6.3 6.2
Change-Id: I8aad69d0cda9564651ddadc2a3d2d0434250b742
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-13 16:17:06 +02:00
Samuli Piippo
7f3cb3884d 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.

Pick-to: 6.3 6.2
Change-Id: I89a5e152324178151ba8a5ab4734d542fa4c995c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-11 12:12:25 +02:00
Samuli Piippo
0e598fb241 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"

Pick-to: 6.3 6.2
Change-Id: I5f05e2e249ef52402626ee3469f32b0c05d58cb5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-11 12:12:18 +02:00
Samuli Piippo
57b22c6ea0 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>
2021-12-31 09:29:05 +00:00
Mikko Gronoff
94f562c5df README.md: update CI test build matrix
Add 6.3 branch.

Pick-to: 6.3
Change-Id: I830b750f783308fee0b856663ffb15c4bcc0aaea
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-31 10:48:53 +02:00
Samuli Piippo
dc6a7797e0 Add QtPDF
Add support for QtPDF, which is build from same sources as QtWebEngine.
The qemu wrapper needs adjustment to work in both webengine and pdf
builds.

Pick-to: 6.3
Task-number: QTBUG-99205
Change-Id: I985c7dac5e61b2c87b3a7ddeba3efcfd71f35e3f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-12-30 09:51:43 +02:00
Mikko Gronoff
c9d0d37cfb 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>
2021-12-29 09:40:40 +02:00
Mikko Gronoff
5909c76dc1 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>
2021-12-29 09:40:40 +02:00
Mikko Gronoff
f50a769afd qt6: update submodules
Update to more recent revisions in dev branch.

Change-Id: I89c0e35684f90534f9f9c0834a49425fad6b7d00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-29 09:40:40 +02:00
Samuli Piippo
bb7b918a57 Update Qt Commercial license
Change-Id: I3668a851635e388d84d6a86c38c415ff82680872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9f5ce3eae8)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-29 09:40:40 +02:00