Commit Graph

257 Commits

Author SHA1 Message Date
Martin Jansa
0232e91200 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"

Change-Id: I22d34d7b1e290eee6406750c4531f9b4dd031c87
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 9f408788ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 12:34:34 +00:00
Martin Jansa
d524cae669 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

Change-Id: I6b2895e0eb2ea4f26b3313de69475b069587af0b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d251bc8f22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 12:34:29 +00:00
Samuli Piippo
9a736ed306 qt3d: disable system assimp
Latest change in upstream assimp breaks the qt3d build. Disable
the system assimp for now.

MJ: Also assimp was removed from oe-core in honister with:
https://git.openembedded.org/openembedded-core/commit/?h=honister&id=92719e01a90f2a80f5cceb2f98a48c49f0c24f1c
due to license issue.

Change-Id: Ib1bf4533a1670b0401748e56dcafb9d1b71fe66a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:34:20 +02:00
Martin Jansa
02d5a6bd43 qtbase: fix build with glibc-2.34
* fails in do_install_ptest_base when ptest is in DISTRO_FEATURES

Change-Id: I89778b3b53594a2ca46a088775689251e82dc8aa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:34:13 +02:00
Martin Jansa
49d6c23cdf 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?

Change-Id: I2c1549f22bebf3c091485644574cbc46402c4996
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit f475a94185)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 12:34:00 +00:00
Martin Jansa
9470ebe195 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

Change-Id: Ia16c038afa7af54295b1cb6c7c9bcccfa311bf0c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1575c7229a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 12:33:55 +00:00
Martin Jansa
85d2f59c51 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.

Change-Id: Ic3f674bcfd7dbbc6f149a1ae94cd66613a948050
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit d718354d16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 12:33:51 +00:00
Martin Jansa
879b08ed03 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:

Change-Id: I0705e15d57f30b5aeb908631d269db3dfd3413f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:33:44 +02:00
Martin Jansa
b74cb78bec layer.conf: LAYERSERIES_COMPAT: Add honister and drop zeus
all currently supported versions (dunfell, hardknott, honister)
do support new syntax (when latest bitbake revision from
corresponding branch is being used).

Drop zeus which is EOL and doesn't support new override syntax.

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: Icee948cb8da0021c3fa968c8720031d6189f274f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:33:37 +02:00
Martin Jansa
6d74a73ef3 Convert to new override syntax
This is the result of automated script (0.9.3) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Change-Id: I23f9e955618b36878635b17265f0d8bb81a5cf55
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:33:32 +02:00
Martin Jansa
a1b2b3841c 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

Change-Id: I20add60b601bd85a7f5eb8b6e6f63e1bc729a893
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 35665dad23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-01 10:34:29 +00:00
Martin Jansa
9d68253366 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)

Change-Id: I137c708ed7e186b4f4d5bbe921cccc7100db48b4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c4147feb79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-01 10:34:21 +00:00
Mikko Gronoff
caaf2ea697 qt6: update submodules
Update to latest content in Qt 6.2.0 branch.

Task-number: QTBUG-91012
Change-Id: I47f9d99d1f8d546a38c74fc1e53c583c3f8475ef
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-27 09:22:29 +03:00
Mikko Gronoff
7f679afdfe qt6-git.inc: sort modules in alphabetical order
qtlocation was qtpositioning for a while, move to
correct place.

Change-Id: If69d0aac0ad485087acc47531c03c2abc3aa7b72
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-24 17:32:28 +03:00
Samuli Piippo
fe4f272d1e 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>
2021-09-24 13:55:06 +03:00
Michal Klocek
680d8b2e24 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}
pacakage, 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>
2021-09-24 06:53:04 +00:00
Samuli Piippo
0b3d35b680 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.

Task-number: QTBUG-96583
Change-Id: I3695cdd21ba9b9443770c671e50bbf230a58cfd6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 626697c8bd)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-22 16:11:59 +03:00
Mikko Gronoff
b0151580d9 qt6: update submodules
Update to latest content in Qt 6.2.0 branch (RC2 snapshot).

Task-number: QTBUG-91012
Change-Id: I3ac14dd17d5a918bec4551dfa7cd1ccebde83766
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-22 12:53:54 +03:00
Samuli Piippo
90911c422d 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.

Change-Id: I7b8028da254be4e6bb1f523fe10947996563186e
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 223788235b)
2021-09-20 09:00:31 +03:00
Daniel Smith
e4311bbcfd Fix whitespace in qt6-git.inc
Change-Id: I5a02c23a27db5706685434ee75eb1087897cc550
(cherry picked from commit 8955a1e397)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-18 06:45:29 +00:00
Samuli Piippo
a6d3d28ae0 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.

Change-Id: I711e7867dba3b066d363ca40f78e7b4aa740a69c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f61b87ae78)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-17 16:39:24 +03:00
Pasi Petäjäjärvi
cf0fda377f qtbase: Add python binary available for ptest
*-native recipes using python fails without this.

Change-Id: Ieb6b45f97ed01c6984522c687c411ff09680b803
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 5a34cf9f49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-17 09:36:30 +00:00
Samuli Piippo
93bc55f4f4 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.

Change-Id: I3a0d646f4204fb0269bba2356543589a5620ed3e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 170ca88bcd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-16 15:54:44 +00:00
Mikko Gronoff
5e0f656cf0 qt6: update submodules
- Update Qt modules to latest content in 6.2.0 branch
- Update deviceutilities to latest revision in 6.2.0 branch
- Update quickdesigner-components to latest revision in dev branch

Task-number: QTBUG-91012
Change-Id: I9a6e2fa39d0b6b6937ec265dc70b70ee9a509ded
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-09-15 07:09:25 +03:00
Samuli Piippo
7f83b93082 Coin: give CI build more time to complete
Raise max build to 12 hours, but lower time without output to 2 hours.

Change-Id: I866bf07324793fce4ce88189053216abd8b4302f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit bc1d2a0fff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-09 20:37:26 +00:00
Samuli Piippo
f45f237084 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

Change-Id: I223e34fb9ecba01a8f3df5123eed6705d93ceed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-09 18:47:58 +03:00
Samuli Piippo
3e09c9011b 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>
2021-09-09 18:47:53 +03:00
Samuli Piippo
e225c808b3 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>
2021-09-09 18:47:48 +03:00
Samuli Piippo
403ab76764 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>
2021-09-09 18:47:43 +03:00
Samuli Piippo
6ce601a4d5 qtmultimedia: fix build with older (<1.16) gstreamer
Some of the video formats were introduces in GStreamer 1.16 and fail
to build with older releases.

Change-Id: I56c04f472840ce6b82f480e9e918d2b4245ab14e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-08 08:23:41 +03:00
Samuli Piippo
251d89e2ca qtmultimedia: add workaround for conflicting declartions in GL headers
Change-Id: Id080829fd0e10c4edad99ea2857550d27c4d6953
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-07 15:44:25 +03:00
Samuli Piippo
7feb5f4a4a qtmultimedia: include only when opengl is available
QtMultimedia current depends on EGL and build fails when opengl
is not available.

Task-number: QTBUG-96251
Change-Id: I26d1c3880db9f5593132bda4617088da6cafe16d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-07 06:59:26 +00:00
Mikko Gronoff
bee140b3b1 qt6: update submodules
Update to latest content in Qt 6.2 branch.

Task-number: QTBUG-91012
Change-Id: Iad7b3e8e9fbda13f9042c984d768f232806413d3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-06 13:48:05 +03:00
Samuli Piippo
32685d7671 Coin: disable qtbase examples in dunfell
As a workround for apparent CMake issue, disable examples from
qtbase.

Task-number: QTBUG-96197
Change-Id: I95cb44f21c22d1e4a1c73913fde5f2a49fcd5530
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-05 21:34:33 +03:00
Samuli Piippo
70dff380b2 Coin: allow yocto version specific configurations
Add easy way to have different configuration for the CI builds
based on the current Yocto version.

Pick-to: dev
Change-Id: Idfda5d2e9079864e210382fa0e928b969fae311d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-05 21:34:22 +03:00
Pasi Petäjäjärvi
ba60bb511b sdk: Add QtShadertool
Provides qsb command line tool for shader compilation/inspection

Change-Id: Icc71773c0cdc1501472448a22056695e499f87a4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 8579e97c0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-30 15:42:29 +00:00
Samuli Piippo
d4232d5a71 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>
2021-08-30 08:18:53 +03:00
Samuli Piippo
bb3c5a08a2 Coin: remove uninative overrides
Upstream has more recent versions already.

Change-Id: Idc64576ddbdb2549e2b4af802cc8b8b5b62f704e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fdda14cfbc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-24 13:36:24 +00:00
Mikko Gronoff
3b3572a59c qt6: update submodules
* Update to latest content in Qt 6.2 branch
* qtquickcontrols2: remove recipe & references
  (quickcontrols2 was merged into qtdeclarative
  module, see QTBUG-95173)
* Proposed 6.2.0 beta3 content - one qtdeclarative patch
  added on top of that to be able to build native side
  successfully (accessibility disabled)

Task-number: QTBUG-91012
Change-Id: Ie72f98518ceae98b83ceddb4b97a3772c40a9185
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-08-17 08:29:54 +03:00
Samuli Piippo
34f86eb73c qt6: update submodules
Latest revisions from 6.2 branches.

Change-Id: If19155088bf0828398c589b2ec7c61d7776f9338
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-08-05 09:17:46 +03:00
Samuli Piippo
36c7a0bd38 Coin: stop using master branch for CI build
Latest bitbake has changed the override syntax to use colons
instead of underscores. This makes master branch incompatible
with meta-qt6 until we convert to the same syntax.

Change-Id: I5181882f44d49ce872f76e1620c5e3c195f6686c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2021-08-04 16:00:41 +03:00
Jani Suonpera
b1230558dd qt6: update submodules for 6.2
Task-number: QTBUG-91012
Change-Id: Ida1e6c8a0397642e98eef5ca866946a369af01cf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-07-26 10:03:34 +03:00
Mikko Gronoff
b39409532c qt6: update submodules
Update to latest content in Qt 6.2 branch.

Task-number: QTBUG-91012
Change-Id: Iefb06a7049002ae014dfb220c08df4a0a615cd27
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2021-07-02 19:12:37 +03:00
Mikko Gronoff
0d88f51b12 qt6: update submodules
Update to latest content in Qt 6.2 branch.

Task-number: QTBUG-91012
Change-Id: Ib8adb7e215a1bbaae6ce4c63f50c74f46a503fdc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-07-01 10:28:53 +03:00
Mikko Gronoff
872cbab2d8 ptest: disable rpaths due QA issue
Disable rpaths from ptest to fix
QA Issue: package contains bad RPATH.

Change-Id: I0d790f276a2e45559675e2e51e95a2cb4b99a5b1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-30 09:00:51 +03:00
Mikko Gronoff
e64bfcb7ec qt6: update submodules
Update to latest content in Qt 6.2 branch.

Task-number: QTBUG-91012
Change-Id: Ia833922fd5956ada244c186854f38be507edef82
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-29 15:00:03 +03:00
Samuli Piippo
4548a015db sdk: use relative paths in qt.conf
Change the absolute host paths in qt.conf to relative. This allows
SDK to work in Windows without need to patch the paths.

Change-Id: I0a3f6e793b033d727f7633c022b27392acc91823
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7ac9c84014)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-28 20:06:39 +00:00
Mikko Gronoff
9a4453aa51 qt6: update submodules
Update to latest content in Qt 6.2 branch.

Task-number: QTBUG-91012
Change-Id: I10eaefcab3d5f8678022e74184b279c25f21c9d4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2021-06-23 08:35:25 +03:00
Samuli Piippo
ac597001df Move libexec to tools
More modules are installing tools to libexec and none have
any runtime binaries there. Include it in the *-tools packages.

Change-Id: I2ed65bc4f88982ef91d2d5758624c16c32a082d6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-14 16:29:20 +03:00
Mikko Gronoff
5377433e3d qt6: update submodules
Update to latest content in dev branch.

- Assimp submodule in qt3d & qtquick3d recipes changed to
  correct "qt6_assimp" branch as it now contains needed
  fixes.
- Qtquick3d patch removed, available upstream

Change-Id: I9d99e14595502d9df0078e7e3f9d876f1c46da0c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-14 16:29:15 +03:00