Commit Graph

265 Commits

Author SHA1 Message Date
Samuli Piippo
a1a2a0b048 Coin: extend CI coverage to older yocto branches
Add dunfell and hardknott to the CI build. Skip building QtWebEngine
in dunfell, since it required newer cmake than dunfell can offer.
As Gatesgarth is already EOL, do not add it to testing although
it is still listed as compatible version.

Task-number: QTBUG-97065
Change-Id: I3538d756294043fae119c78d018c61be766f2538
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-10-06 10:17:00 +03:00
Samuli Piippo
a604992ea8 qtbase: remove runtime dependency to libssl from native package
This a workaround for Dunfell, where native packages are still
cleared which means that qtbase-native cannot have runtime dependency
to libssl as the package does not exist.

Fixes:
ERROR: Required build target 'qtbase-native' has no buildable providers.
Missing or unbuildable dependency chain was: ['qtbase-native', 'libssl-native']

Pick-to: 6.2
Change-Id: Idad2a85b3a84275e5824545e22d425b578d1d647
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-10-06 10:16:19 +03:00
Qt Submodule Update Bot
85ab186d39 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I9774179f752eb25158e8cc7d5f4a872f1465876a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-05 20:44:22 +00:00
Martin Jansa
9e9dabfb42 qtbase: fix build with glibc-2.34
* fails in do_install_ptest_base when ptest is in DISTRO_FEATURES

Pick-to: 6.2
Change-Id: I89778b3b53594a2ca46a088775689251e82dc8aa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 11:13:31 +00:00
Martin Jansa
56020edacc Revert "qtbase: skip qtestlib's selftests"
This reverts commit fc83f6dfbd.

No need to disable all tests, next commit adds a work around
fix for Catch2.

Change-Id: Ic0e1a7cb085ca54edecc690c40d9adb82f952678
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 13:13:27 +02:00
Qt Submodule Update Bot
b304ef5ca1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I8193ac6f136be1486903dafc5eac15608448b3d6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-01 13:35:56 +00:00
Martin Jansa
35665dad23 qtwebengine: 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 "webengine_system_icu": Forcing to "ON" breaks its condition:
|     ICU_FOUND
| Condition values dump:
|     ICU_FOUND = ""
|
| ERROR: Feature "webengine_system_libwebp": Forcing to "ON" breaks its condition:
|     UNIX AND WEBP_FOUND
| Condition values dump:
|     UNIX = "1"
|     WEBP_FOUND = ""
|
| ERROR: Feature "webengine_system_opus": Forcing to "ON" breaks its condition:
|     UNIX AND OPUS_FOUND
| Condition values dump:
|     UNIX = "1"
|     OPUS_FOUND = ""
|
| ERROR: Feature "webengine_system_glib": Forcing to "ON" breaks its condition:
|     UNIX AND GLIB_FOUND
| Condition values dump:
|     UNIX = "1"
|     GLIB_FOUND = ""
|
| ERROR: Feature "webengine_system_zlib": Forcing to "ON" breaks its condition:
|     UNIX AND QT_FEATURE_system_zlib AND ZLIB_FOUND
| Condition values dump:
|     UNIX = "1"
|     QT_FEATURE_system_zlib = "ON"
|     ZLIB_FOUND = ""
|
| ERROR: Feature "webengine_system_libevent": Forcing to "ON" breaks its condition:
|     UNIX AND LIBEVENT_FOUND
| Condition values dump:
|     UNIX = "1"
|     LIBEVENT_FOUND = ""
|
| ERROR: Feature "webengine_system_lcms2": Forcing to "ON" breaks its condition:
|     UNIX AND LCMS2_FOUND
| Condition values dump:
|     UNIX = "1"
|     LCMS2_FOUND = ""
|
| ERROR: Feature "webengine_system_libpng": Forcing to "ON" breaks its condition:
|     UNIX AND TARGET Qt::Gui AND PNG_FOUND AND QT_FEATURE_system_png
| Condition values dump:
|     UNIX = "1"
|     TARGET Qt::Gui found
|     PNG_FOUND = ""
|     QT_FEATURE_system_png = "ON"
|
| ERROR: Feature "webengine_system_libjpeg": Forcing to "ON" breaks its condition:
|     UNIX AND TARGET Qt::Gui AND TEST_jpeg AND QT_FEATURE_system_jpeg
| Condition values dump:
|     UNIX = "1"
|     TARGET Qt::Gui found
|     TEST_jpeg = "FALSE"
|     QT_FEATURE_system_jpeg = "ON"
|
| ERROR: Feature "webengine_system_harfbuzz": Forcing to "ON" breaks its condition:
|     UNIX AND TARGET Qt::Gui AND HARFBUZZ_FOUND AND QT_FEATURE_system_harfbuzz
| Condition values dump:
|     UNIX = "1"
|     TARGET Qt::Gui found
|     HARFBUZZ_FOUND = ""
|     QT_FEATURE_system_harfbuzz = "ON"
|
| ERROR: Feature "webengine_system_freetype": Forcing to "ON" breaks its condition:
|     UNIX AND TARGET Qt::Gui AND TEST_freetype AND QT_FEATURE_system_freetype
| Condition values dump:
|     UNIX = "1"
|     TARGET Qt::Gui found
|     TEST_freetype = "FALSE"
|     QT_FEATURE_system_freetype = "ON"
|
| ERROR: Feature "webengine_system_libpci": Forcing to "ON" breaks its condition:
|     UNIX AND LIBPCI_FOUND
| Condition values dump:
|     UNIX = "1"
|     LIBPCI_FOUND = ""

Already fixed in meta-qt5 with:
bf2daefeb5

Pick-to: 6.2
Change-Id: I20add60b601bd85a7f5eb8b6e6f63e1bc729a893
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 06:02:22 +00:00
Martin Jansa
c4147feb79 qtwebengine: enable webrtc-pipewire only when multimedia-layer is included
* pipewire recipe is in meta-multimedia not meta-oe layer
* fixes:
  ERROR: Nothing PROVIDES 'pipewire' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtwebengine_git.bb DEPENDS on or otherwise requires it)

Pick-to: 6.2
Change-Id: I137c708ed7e186b4f4d5bbe921cccc7100db48b4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 06:01:34 +00:00
Martin Jansa
b38b4c77ce 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>
2021-10-01 08:00:31 +02:00
Martin Jansa
9f408788ec qtconnectivity: 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 "bluez": Forcing to "ON" breaks its condition:
|     BLUEZ_FOUND AND QT_FEATURE_dbus
| Condition values dump:
|     BLUEZ_FOUND = "0"
|     QT_FEATURE_dbus = "ON"

Pick-to: 6.2
Change-Id: I22d34d7b1e290eee6406750c4531f9b4dd031c87
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 06:00:25 +00:00
Martin Jansa
d251bc8f22 qtwayland: 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 "xcomposite_glx": Forcing to "ON" breaks its condition:
|     QT_FEATURE_wayland_client AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 AND QT_FEATURE_xlib AND XComposite_FOUND
| Condition values dump:
|     QT_FEATURE_wayland_client = "ON"
|     QT_FEATURE_opengl = "ON"
|     QT_FEATURE_opengles2 = "OFF"
|     QT_FEATURE_xlib = "ON"
|     XComposite_FOUND = "0"

Already fixed in meta-qt5 with:
51d1ed13f5

Pick-to: 6.2
Change-Id: I6b2895e0eb2ea4f26b3313de69475b069587af0b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 06:00:19 +00:00
Martin Jansa
f475a94185 qtserialport: 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:
CMake Error at TOPDIR/BUILD/work/raspberrypi4-webos-linux-gnueabi/qtserialport/6.2.0-r0/recipe-sysroot/usr/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:2063 (add_library):
  Target "SerialPort" links to target "PkgConfig::Libudev" but the target was
  not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?

Pick-to: 6.2
Change-Id: I2c1549f22bebf3c091485644574cbc46402c4996
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 06:00:05 +00:00
Martin Jansa
1575c7229a qtsensors: 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:
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE)
Sensorfw pkg not found. Looking for library
CMake Error at cmake/FindSensorfw.cmake:9 (find_library):
  find_library called with incorrect number of arguments

Pick-to: 6.2
Change-Id: Ia16c038afa7af54295b1cb6c7c9bcccfa311bf0c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 05:59:59 +00:00
Martin Jansa
d718354d16 qtmultimedia: 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 'pulseaudio' was enabled, but the pre-condition 'libs.pulseaudio' failed.

Similar change was already applied in meta-qt5:
f200be9d67
but the same is needed for qt6.

Pick-to: 6.2
Change-Id: Ic3f674bcfd7dbbc6f149a1ae94cd66613a948050
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 05:59:53 +00:00
Martin Jansa
e8c910995e qtbase: 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 webos_pkgconfig.bbclass as
we're using it here.

Fixes:
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE)
...
ERROR: Feature "zstd": Forcing to "ON" breaks its condition:
ERROR: Feature "libudev": Forcing to "ON" breaks its condition:

Pick-to: 6.2
Change-Id: I0705e15d57f30b5aeb908631d269db3dfd3413f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 05:59:45 +00:00
Martin Jansa
c9dcbe825e layer.conf: LAYERSERIES_COMPAT: Return dunfell, gatesgarth and hardknott
all currently supported versions (dunfell, hardknott, honister)
do support new syntax (when latest bitbake revision from
corresponding branch is being used).

if it's still not clear, then bitbake is accepting ':' in
** dunfell with 1.46:
   https://git.openembedded.org/bitbake/commit/?h=1.46&id=a6d5fb7554e3cf071e453db56a1e7469ac44277c
   https://git.openembedded.org/bitbake/commit/?h=1.46&id=c5418eae56cc50dbae7951c055434a0c456c53a4
** gatesgarth with 1.48:
   https://git.openembedded.org/bitbake/commit/?h=1.48&id=aa9f7b80cfdb1119050af469a07ebd949829026c
   https://git.openembedded.org/bitbake/commit/?h=1.48&id=14ae61205111383d5f609519c02476925184f6d1
** hardknott with 1.50:
   https://git.openembedded.org/bitbake/commit/?h=1.50&id=f8d1bc200460fc1cb5cbf7a7d1986fd86424b22d
   https://git.openembedded.org/bitbake/commit/?h=1.50&id=9b2d96b27f550da0fa68ba9ea96be98eb3a832a6
** honister with 1.51+:
   https://git.openembedded.org/bitbake/commit/?id=0dbbb4547cb2570d2ce607e9a53459df3c0ac284
   https://git.openembedded.org/bitbake/commit/?id=019251649a38754d5877759d13b664e28dea77de
   and required since:
   https://git.openembedded.org/bitbake/commit/?id=7dcf317cc141dc980634f8c18bfa84f83e57206a

Similarly for poky users (which get bitbake updates together with oe-core updates in combo-layer managed poky repo):
** dunfell:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=dunfell&id=1f7b04355c032cd0de4cbe9352745920964c8057
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=dunfell&id=9c2186108e2e8fcf5837c0ffe9dbdeeaea4b7398
** gatesgarth:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=gatesgarth&id=f2d2136dbb3730abb87699ce03dd54c27ebb7833
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=gatesgarth&id=779ca22928bce94849e32c1bdd5f5d0f64658c2d
** hardknott:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=hardknott&id=666d3421389cc3c01c56e92199cc32bddf1922de
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=hardknott&id=14c5392fded42f17962e1cc07fcc0446881b4fa0
** honister:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=75fad23fc06c008a03414a1fc288a8614c6af9ca
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=d41af446febd516f14f26db53e6572d9eae35b1e
   and required since:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=2abf8a699edd513405befbd1a0eafc8f55d6b514

If your builds don't accept new syntax, then you just need to update bitbake a bit.

Change-Id: I0adbb1ba75086bc61101b1aa5bb99660c5250bbb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 07:59:33 +02:00
Samuli Piippo
197eef0cee qtwebengine: explicitly inherit bbclass for intel workaround
get_glibc_loader is provided by linuxloader bbclass, make sure
we inherit that. Also change the function to get_linuxloader
that provides correct loader based on the used libc.

Amends e225c808b3

Change-Id: Ic8cd3dc8c4d908a4f0c3256d49209bf2d2ddf4d3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fe4f272d1e)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-30 13:24:06 +03:00
Michal Klocek
859178fa7a Fix missing QtWebEngineProcess on images
QtWebEngineProcess is not deployed on images, reason for that is
that current package order is:

PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"

where ${PN}-tools will grap the QtWebEngineProcess before ${PN}
package, since it includes all ${QT6_INSTALL_LIBEXECDIR}.

Simply add qtwebengine-tools, and remove superfluous path
from qtwebengine recipe.

Fixes: QTBUG-96857
Change-Id: Ibe1d35e916caf38b75a8452c041bbff888103018
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 680d8b2e24)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-30 10:23:59 +00:00
Samuli Piippo
5c98b3aeac qtbase: disable tests that fail with gold linker
Some of the tests fail with gold linker.
error: unexpected reloc 3 against global symbol qt_version_tag without base register in object file when generating a position-independent output file
collect2: error: ld returned 1 exit status

Cherry-pick updated with more tests for dev.

Change-Id: I223e34fb9ecba01a8f3df5123eed6705d93ceed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f45f237084)
2021-09-30 13:23:52 +03:00
Samuli Piippo
d2903da2d0 qt6: use gold when it's selected in DISTRO_FEATURES
Gold linker offers bettern performance than bfd.

Change-Id: I64b44234b758abde17fbdcb206cb15a7f6a0a0e0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3e09c9011b)
2021-09-30 13:23:45 +03:00
Samuli Piippo
b68949651c qtwebengine: add workaround for x86-64 targets
Some x86-64 target, such as intel-skylake-64, use AVX instructions that are
not supported by QEMU (https://gitlab.com/qemu-project/qemu/-/issues/164).
This causes the build tools to crash with QEMU when they are ran during
to build. Instead of using QEMU, change the wrapper to try to run the
tools directly, using the target dynloader.

Change-Id: I790e013f91ce5f0e42fb1e11ff61e4428d14d9ad
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit e225c808b3)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-30 13:23:35 +03:00
Samuli Piippo
4f46daa9e2 Add QtWebEngine
Build QtWebEngine using CMake. Include helper files (chromium-gn.inc and
gn-utils.inc) from meta-browser. QtWebEngine build no longer requires
additional support in the host system, instead the build time tools
are run using QEMU.

WebEngine requires python2, available from meta-python2 layer, and
at least CMake 3.19. Only oe-core/hardknott provides recent enough CMake.
CI builds of webengine are limited to hardknott for this reason.

To use system ICU, QtWebEngine requires ICU 68 or up. This is also
available starting from oe-core/hardnott.

spellchecker feature doesn't work properly, since it requires
a native util to be built.

Task-number: QTBUG-93825
Change-Id: Id150275f5adfedd8f1acdc5f92c46a437da84f2e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 403ab76764)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-30 13:23:25 +03:00
Qt Submodule Update Bot
20429485e3 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I12b9d6d6cfd3b3cc847bf8588f6f4a620fc46d1d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-30 00:18:12 +00:00
Qt Submodule Update Bot
f192e64cb9 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Iba3ead6f8010fd65c643368610f5f6159c826162
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 05:03:22 +00:00
Qt Submodule Update Bot
14686c4580 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I78f8824786626be308a1369e7833d326e918b441
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 00:27:15 +00:00
Pasi Petäjäjärvi
ce7a39b78b QtIF: Use qface from 3rd party repo
With newer yocto old qface recipe using our internal repo
suddenly preferred pypi own repository for qface. So
use external version of qface instead and try to get that
added to meta-python also.

Fixes: QTBUG-96727
Change-Id: Ia6fae613f6d8ced531dad2bda4f1abc18cbf7eba
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-24 07:46:29 +00:00
Daniel Smith
6b3073a959 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I663bd2937e769716f57e0a0252c76741f44181a7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-22 16:12:33 +03:00
Samuli Piippo
626697c8bd ptest: don't package debug files from tests
Debug files from tests were packaged along with everything else causing
toolchain to have over 3Gb of debug files of little use. Since the
packaging of the debug files is done dynamically, we'll need to remove them
using an additional function that run during the packaging.

Pick-to: 6.2
Task-number: QTBUG-96583
Change-Id: I3695cdd21ba9b9443770c671e50bbf230a58cfd6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-22 09:49:11 +03:00
Samuli Piippo
223788235b qttools: rename git submodule
QtTools is using a git submodule within a submodule. Rename it so
that the parent chain is recorded correctly for scripts to handle
the update.

Pick-to: 6.2
Change-Id: I7b8028da254be4e6bb1f523fe10947996563186e
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-18 09:44:47 +03:00
Pasi Petäjäjärvi
d4572bf1b9 QtInterfaceFramework: Add support
Adds Qt Interface Framework module.

Task-number: QTBUG-94105
Change-Id: I3f8a1caf251e2e6b8be55e78361a3e0f2b95fca4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-17 09:53:57 +03:00
Pasi Petäjäjärvi
bfd5af7306 QFace: Add support
Adds Qt Interface Language (QFace) library

* Add also python dependencies that are not available from
meta-python

Task-number: QTBUG-94105
Change-Id: I08e5198834c36b0019bbc99a3a3f0b0fbc8b422a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-17 09:53:24 +03:00
Pasi Petäjäjärvi
5a34cf9f49 qtbase: Add python binary available for ptest
*-native recipes using python fails without this.

Pick-to: 6.2
Change-Id: Ieb6b45f97ed01c6984522c687c411ff09680b803
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-17 09:53:12 +03:00
Daniel Smith
8955a1e397 Fix whitespace in qt6-git.inc
Change-Id: I5a02c23a27db5706685434ee75eb1087897cc550
Pick-to: 6.2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-16 15:54:39 +00:00
Samuli Piippo
170ca88bcd Coin: increase CPU count for CI builds
For Coin builds, ask for 16 core build machine, but limit the maximum
number of bitbake tasks to 8. Try to speed up the builds, but to avoid
OOM which can occur when several Qt modules start to build in parallel
after dependency to qtdeclarative is satisfied.

Pick-to: 6.2
Change-Id: I3a0d646f4204fb0269bba2356543589a5620ed3e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-16 15:08:07 +03:00
Samuli Piippo
f61b87ae78 Move all Qt module SRCREVs into one file
Move all the module SRCREV into qt6-git.inc file using the same format,
where repository name is used for the postfix. Changes to the module SRCREVs
are mostly done by updating all the modules at once, usually either with
a separate update script, srcrev_update bbclass or by external update bot.
This change should make the update process more easily automated.

Update the srcrev_update bbclass to handle updates in qt6-git.inc in addition
to recipe files, with and without the repository name postfix.

Pick-to: 6.2
Change-Id: I711e7867dba3b066d363ca40f78e7b4aa740a69c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-15 07:53:53 +03:00
Samuli Piippo
c592e2d63e qt6: update submodules
Latest revisions from dev.

Change-Id: Ia9b1bed92a4d6d5ffad5293bece76278e9d14a8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-14 11:46:27 +03:00
Qt Submodule Update Bot
3c758b95f9 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I92f253edbbc735d2a8a3988fe098805609751ecb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 20:33:47 +00:00
Samuli Piippo
bc1d2a0fff Coin: give CI build more time to complete
Raise max build to 12 hours, but lower time without output to 2 hours.

Pick-to: 6.2
Change-Id: I866bf07324793fce4ce88189053216abd8b4302f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-09 22:11:07 +03:00
Pasi Petäjäjärvi
02f96bd7d5 qtbase: Enable ssl support
Required by QtApplicationManager to build appman-packager binary
for host.

Change-Id: Ia31e2df611fe4876110ba9999dd4f60374b783b1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-09 15:59:46 +03:00
Qt Submodule Update Bot
b8559ccc5e Update submodule refs on 'dev in meta-qt6'
Change-Id: I8aaec3cc12e3f73bff5cef14c89cd6e6f151950d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-06 22:41:24 +00:00
Qt Submodule Update Bot
36874e37df Update submodule refs on 'dev in meta-qt6'
Change-Id: I1368c54317e3cb1f30ff84f8d5883e1453a2afc9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-06 08:57:01 +00:00
Samuli Piippo
6886bebec1 Coin: allow yocto version specific configurations
Add easy way to have different configuration for the CI builds
based on the current Yocto version.

Change-Id: Idfda5d2e9079864e210382fa0e928b969fae311d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 70dff380b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-05 19:43:49 +00:00
Samuli Piippo
a7720008b6 Coin: use toolchain for the CI test
Build the toolchain recipe for CI test, which allows us the limit
what recipes are included.

Change-Id: I9c532dcc97979bf40a0ca094850d7a0602f2f9d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d4232d5a71)
2021-09-02 08:48:17 +03:00
Samuli Piippo
3bcc10f225 Remove QtQuickControls2
QtQuickControls2 was merged into QtDeclarative, no need for separate
recipe anymore.

Change-Id: I0bc860c7140c98f920b9811498491644245c7e0b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-02 08:47:45 +03:00
Samuli Piippo
e2d514aae2 qt6: update submodules
Latest revision from dev branches.

Change-Id: Ibaf1f00b96a441a5284e32863683212235b9ec48
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-02 08:47:38 +03:00
Pasi Petäjäjärvi
8579e97c0d sdk: Add QtShadertool
Provides qsb command line tool for shader compilation/inspection

Pick-to: 6.2
Change-Id: Icc71773c0cdc1501472448a22056695e499f87a4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-08-30 07:38:15 +00:00
Samuli Piippo
6be91065b6 qt3d: disable system assimp
Latest change in upstream assimp breaks the qt3d build. Disable
the system assimp for now.

Change-Id: Ib1bf4533a1670b0401748e56dcafb9d1b71fe66a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 14:37:49 +03:00
Samuli Piippo
fc83f6dfbd qtbase: skip qtestlib's selftests
The selftest fails with GCC 11

Task-number: QTBUG-95842
Change-Id: I021297f3e0a95c08c03c1e19460de2969d88532e
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-08-24 14:37:44 +03:00
Samuli Piippo
fdda14cfbc Coin: remove uninative overrides
Upstream has more recent versions already.

Pick-to: 6.2 6.1
Change-Id: Idc64576ddbdb2549e2b4af802cc8b8b5b62f704e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 14:37:40 +03:00
Samuli Piippo
a77f474aba Coin: add required zstd
Bitbake now requires zstd, which is not yet available in the provisioning
of the CI machines.

Change-Id: I9f75219a686580ae228384c4fb4a6222a0e6fd09
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 14:37:36 +03:00