Commit Graph

530 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
0c3060bd18 Update submodule refs on '6.4.1' in yocto/meta-qt6
Change-Id: I180a47a4f1f6fbbebbebf705e341184e3b0552fc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-10 14:07:19 +02:00
Samuli Piippo
80ba90f3bb qtwebengine: add dependency to cups
Printing support needs cups in cases when it's not already enabled
in qtbase.

Change-Id: I5435bdd61b418f91524726571c9acd2cea92c729
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7731aab502)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 16:02:16 +00:00
Qt Submodule Update Bot
c7d3eeafc6 Update submodule refs on '6.4.1' in yocto/meta-qt6
Change-Id: Ifcbbde5ebbe191c15aba5adf78e9b3013e465679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-04 07:06:02 +00:00
Mikko Gronoff
13d9ab088b qt6-git.inc: switch modules to 6.4.1 branch
Change-Id: If3507b69d77d2f119ab5084be69a5057bd97448f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-11-04 09:05:45 +02:00
Mikko Gronoff
0ea9d0bc2a webengine: add patch for python 3.11 build issue
yocto master branch updated python to 3.11, resulting
in webengine build error(s):

"File "/home/qt/work/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/qtwebengine/6.4.1-r0/git/src/3rdparty/chromium/tools/grit/grit/util.py", line 214, in ReadFile
with io.open(filename, mode, encoding=encoding) as f:
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ValueError: invalid mode: 'rU'"

Add patch from chromium upstream.

Change-Id: I6308d2acd17a74b20ad6651d59f34e7246dc96ef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 676e6da41b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-03 13:25:30 +00:00
Qt Submodule Update Bot
cfbb672e4c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I2e5a33b5b517736b8f545be4c9ace34e2300cb16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-26 17:28:43 +00:00
Samuli Piippo
c8b68f42a6 Add license mapping for GFDL-1.3-no-invariants-only
Add license mapping for GFDL-1.3-no-invariants-only to use the GFDL-1.3
license file in older Yocto releases. This recudes warnings for missing
generic licenses.

Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit e950cff143)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:51:10 +00:00
Qt Submodule Update Bot
32f314a804 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I43fe57c91fd4b45565fefe5c1a5ed1c96a012fc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 02:13:06 +00:00
Samuli Piippo
1ff68d381d qtquick3dphysics: include the new cooker tool to images
QtQuick3DPhysics has a new runtime tool that should be included
in the images.

Change-Id: Ib6dd643217b1dea76ff42a48183f78427cc2eadf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 444b6cc7ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 12:03:30 +00:00
Qt Submodule Update Bot
b1098ad35f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ibb9446bd62789bd502029acf4363d18b1ac084d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-19 12:41:34 +00:00
Qt Submodule Update Bot
58494287fa Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I3e1eadb02c8b057d1bfdb4232c46482ade664905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-18 20:00:45 +00:00
Qt Submodule Update Bot
f845625029 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I7f5c0841a6d0c72c06b5b07098431c10e6f3b3d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-17 15:27:09 +00:00
Qt Submodule Update Bot
229a8aa72c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib69e9e7ef613d3ab51729248e84d7e1c7edbb732
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-14 20:27:43 +00:00
Qt Submodule Update Bot
13fa05a85d Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I705c5d4cfadd797580b1e9efe1d2f64fa6329537
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-13 17:31:46 +00:00
Samuli Piippo
25fde8d225 qtbase: avoid cmake archiving api for native build
After 812bf25183, we need to extend the
workaround for badly configured CMake also to qtbase-native. This fixes
error: CMake was not built with zstd support. Rebuild CMake or
set QT_AVOID_CMAKE_ARCHIVING_API=ON.

Fixes: WEBOSCI-54
Change-Id: I33c97b1a051fe90d706461c83f75912aa1c1c820
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
(cherry picked from commit 0bb5361fe0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-10 17:29:23 +00:00
Qt Submodule Update Bot
c8b5b038b8 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4602d6622c1d164b0388429f78faa77dd4e56c99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-10 03:19:51 +00:00
Qt Submodule Update Bot
7e80361dd8 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I32dd23ced3a1c298f061f48292aa16c4d680792b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-06 19:38:12 +00:00
Qt Submodule Update Bot
d5005ea344 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Iad4a5769adba631a25f673f74131711c66da7640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-04 03:19:49 +00:00
Qt Submodule Update Bot
3a3a8a3f07 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ib4569ba3b7c9fca5accc352fde93233c61c3cb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-30 17:58:54 +00:00
Qt Submodule Update Bot
20019ba1a2 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Iea589e6d2a32fa92e467955bab9222cd814b85bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-27 10:17:07 +00:00
Qt Submodule Update Bot
8b1cbd2106 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I1143e3938c903fa08941ef751035e391d20cf87c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-20 17:04:11 +00:00
Qt Submodule Update Bot
6a31110ac7 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ia5ebd30942883d0a3d60677c428419cfc29691c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-19 18:31:34 +00:00
Samuli Piippo
fc712f0ad3 Bump version to 6.4.1
Change-Id: I7db1353767dd4a77a36ab8de77c6049fd3e931fc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-09-19 18:31:33 +00:00
Qt Submodule Update Bot
56f1a85834 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I51509810e629ac1882d57bae1003422d25eecaea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-16 00:52:46 +00:00
Samuli Piippo
43b3fbce4e qtinterfaceframework: add RRECOMMEND for the simulation package
If simulation support is enabled, make sure the package gets installed
to the image and toolchain. CMake files have references to the plugins
which causes builds to fail if interfaceframework is used with the SDK.

Change-Id: I7cf0fc334644ce38e783f6b7e21a7f5b082dacd0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 18e0008e9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-15 05:44:42 +00:00
Qt Submodule Update Bot
b9c9ddab3f Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I724b292d60a93ffdaa2305e70ff1b718e510b011
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-14 18:41:50 +00:00
Qt Submodule Update Bot
7135d8a2fd Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Id43ebb56f135a4642504621879a013861905e4f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-13 21:22:57 +00:00
Samuli Piippo
5a8ac5afd2 ptest: fix test build with latest qml tools
Qml tools are now using --bare option, which limits where the tools
tries to find the qml modules. For the test builds, we again need to
use QT_ADDITIONAL_PACKAGES_PREFIX_PATH to tell the tools where to
find qml files for the Qt module we are currently building.

Task-number: QTBUG-106365
Change-Id: I6dfcd32f405475de0f58448cbaa7a19e26cbcfe8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 63eeb3b83e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-13 16:29:26 +00:00
Qt Submodule Update Bot
f978e5662a Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4de7e53dee7b2fe7063f35448539ddbc4b034dc5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-12 18:00:24 +00:00
Qt Submodule Update Bot
ae49fb1b37 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I4c19099db45b95b970fb0b387f05dac99f0fa4ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-09 18:56:30 +00:00
Qt Submodule Update Bot
026698ac3c Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I25582c61857acf89823811c2aad35f40990d3b76
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-08 07:51:55 +00:00
Samuli Piippo
9a24a4f06c ptest: remove references to destination directory
Tests are build against the destination directory where qt module was
just installed. This causes extra files to be taken into source package
and adds references to the TMPDIR, which produces QA warnings from
buildpaths QA test. Use DEBUG_PREFIX_MAP to get rid of those paths.

Task-number: QTBUG-105913
Change-Id: I01ed9261004410db307f2cd809a181377b734c9e
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 497624e967)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-01 14:35:00 +00:00
Samuli Piippo
4de9aa753f ptest: remove build paths from tests
Testlib adds references to the build and source directories to tests,
which causes warnings on buildpaths QA test. Remove those references.

Task-number: QTBUG-105913
Change-Id: Ic63e72a0b11bef55876ef5ca40d0c1d753243004
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 3102804b65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-01 14:34:54 +00:00
Qt Submodule Update Bot
137b6272df Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I8f9387a4bc343bde22e6f062b00fd6a1b5f72806
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-29 06:36:40 +00:00
Qt Submodule Update Bot
350d5522cb Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I1bc3427a3a1b1a0add63312e8fc2de3f7467c043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-25 18:12:52 +00:00
Samuli Piippo
ee95f2787f qtbase: remove unneeded scripts
Reduce warnings from buildpaths QA test (contains reference to TMPDIR)
and remove few build utils that are not usable in bitbake build.
Run same do_install steps for all qtbase builds instead of keeping
separate ones for nativesdk.

Change-Id: Id8a6c4c3b03a850bdb1f99e3a3a08973e134eafc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ee836b7a9f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-24 17:10:02 +00:00
Samuli Piippo
4c86fd2bfe Remove QMAKE_PRL_BUILD_DIR from prl files
Reduce warnings from buildpaths QA test (contains reference to TMPDIR)
by removing QMAKE_PRL_BUILD_DIR from prl files.

Change-Id: I1a5fbac82c4a026b6ba41db3b0cca6a9fbf1e31a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8fb6c082d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-24 17:09:55 +00:00
Qt Submodule Update Bot
19a47978ff Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I57e25125538d337a102c5a3d2c17b719150e3cfc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-24 00:30:10 +00:00
Qt Submodule Update Bot
6fa3898217 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: Ife906871d6fdd83de4fe191826e7975d2c0347b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-18 17:54:37 +00:00
Samuli Piippo
021a80df22 qmlcompilerplus: add dependency to native
If we stop forcing build of target tools, we then need to have
dependency to the native package.

Change-Id: Ie5d9634ba4c85af877920e66fd88d36880af8afc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8228b69a19)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-17 12:24:33 +00:00
Qt Submodule Update Bot
c543c0a1a3 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I772e2bc050cc2eaaaf04b0f9b51c1f67b83d4733
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-17 04:28:28 +00:00
Samuli Piippo
1aa9356372 qtbase: remove initial host path from CMake files
Amend 0b55d8ec94 and remove the initial
host paths from CMake files. They point to the temporary build paths
and cause build breaks in declarative builds.

Change-Id: I17d46b989f024e71ec617ff130c8ea7d7fc85641
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7d1d6a11af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-15 13:00:38 +00:00
Samuli Piippo
0b55d8ec94 sdk: rework how QT_HOST_PATH is set in sdk
After qtbase change 0f8017efb6d037c4f33f947eb3c56aeafa28313c, QT_HOST_PATH
is no longer set in qt.toolchain.cmake, but it was moved to Qt6 package
cmake files. Since the package is in target sysroot, we can no longer use
its location to determine the absolute path of the host sysroot. Instead,
resolve QT_HOST_PATH now in the CMake subscripts and use them also without
the environment-setup script from Qt6Toolchain.cmake.

Pick-to: dev
Change-Id: I81d908321c0d05ab589b9340a62a45800e936252
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-12 10:45:30 +00:00
Samuli Piippo
c6e8ab8bc6 Revert "qtdeclarative: fix test builds"
This reverts commit 810f41bd6a.

The commit was been reverted in qtdeclarative, patch is no longer needed.

Pick-to: dev 6.3
Change-Id: I26e13bb2c8c1b0e464cc69673df56833ea7a9985
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-08-12 10:45:20 +00:00
Qt Submodule Update Bot
24d01f12a7 Update submodule refs on '6.4' in yocto/meta-qt6
Change-Id: I16240891be4b98c945ab3dbeef4b3e514115f230
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-12 10:45:12 +00:00
Michal Klocek
95994d5308 Add zlib dependency for qtbase
Zlib is mandatory dependency, meaning if there is no system
one qt will do bundled one. This is important to
know which one is used as webengine will try to build also
bundled one.

Task-number: QTBUG-103149
Change-Id: Ie7cc83dea558a5605295133fb0bf6fe0a3217492
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit a565bccb07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 18:09:32 +00:00
Samuli Piippo
3a15028d00 qtbase: build native and nativesdk with zstd enabled
rcc is using zstd to compress resources, so that needs be
enabled also in native and nativesdk builds.

Change-Id: Ic10758eb41a67712e55b44bfec4d4385d0512f7e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 812bf25183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 18:09:27 +00:00
Samuli Piippo
a6ebbd8c06 Coin: enable examples for qtapplicationmanager
Change-Id: If4065a9b309fafd8e05d018495dedd22be956aa7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 85d9d71e27)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 18:09:21 +00:00
Samuli Piippo
c1441fcabc qtwebengine: move to 102-based chromium
Latest chromium no longer supports x86 builds.
Enabled spellchecker as build fails without it.

Pick-to: dev
Change-Id: I6f40d48c20a47edbbc958e2f9c25907d05feb5b1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-10 18:09:13 +00:00
Samuli Piippo
e83368abff qtdeclarative: fix test builds
Revert commit that causes ptest build to fail when QmlCompiler is used:
ld.gold: error: [...]/recipe-sysroot-native/usr/lib/libQt6QmlCompiler.so.6.5.0: incompatible target

Change-Id: Ief349b65f59d57c5e0299adb4304278f70da3578
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 810f41bd6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 18:09:05 +00:00