Commit Graph

227 Commits

Author SHA1 Message Date
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
Samuli Piippo
d242882342 Coin: update CI build to use only master branches
Cannot test with older yocto releases anymore.

Task-number: QTBUG-95705¶
Change-Id: Ibc2d07c2a40461971085ff80ee3f946824f0c4f8
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-08-24 14:37:31 +03:00
Samuli Piippo
7c25fc3c70 Remove support for previous yocto versions
After the override syntax change, only honister is supported.

Task-number: QTBUG-95705
Change-Id: I2747686f359ef0e39471bb2c20e7980ea2d30647
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 11:37:26 +00:00
Samuli Piippo
7e83f2fc76 Convert to new override syntax
This is the result of automated script (0.9.1) conversion:

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

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

Task-number: QTBUG-95705
Change-Id: Ieb57084e2cea47eb3407960ebfce404cee1ddc36
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 14:37:21 +03:00
Samuli Piippo
4c5510f0d6 qt6: update submodules
Latest from dev branch.
Disable rpaths from ptest to fix QA Issue: package contains bad RPATH.

Change-Id: I3f29de8a9200657d9ac2eb87d4288fde09b49469
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-29 15:41:23 +00:00
Samuli Piippo
7ac9c84014 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.

Pick-to: 6.2 6.1
Change-Id: I0a3f6e793b033d727f7633c022b27392acc91823
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-28 15:27:36 +03:00
Samuli Piippo
156b085f49 qt6: update submodules
Latest from dev that will become 6.3.0

Change-Id: Ia75b4885a91a1bd97504de149558a048749a14e5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-16 15:30:36 +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
Samuli Piippo
29999c4ffb qtgraphicaleffect: remove recipe
QtGraphicalEffects has been moved to be part of qt5compat
module for compatibility with Qt 5 code. This can be accessed
by importing "Qt5Compat.GraphicalEffects

Pick-to: 6.1
Change-Id: Ia3478e300938a9c612472bf98256d0f521489c33
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-06-11 06:40:34 +03:00
Alexey Edelev
a4fa1a93d8 Add recipe-sysroot path to the standalone test build
Module dependency lookup mechanism requires all Qt dependencies
acessible through the paths specified in PATHS parameter of the
find_dependency call. Since cross-repo dependencies are available
only in recipe-sysroot, it's necessary to add it explicitly
to the QT_ADDITIONAL_PACKAGES_PREFIX_PATH cache variable.

Change-Id: I506456bc715943ae7ba2ebe61e1a38936bb93a31
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-10 14:33:07 +02:00
Samuli Piippo
f850278548 qmake: use correct host prefix
QT_HOST_PREFIX should point to the root of the host sysroot.

Pick-to: 6.1
Change-Id: I7bb02df58da432ef70dba47f5e5866948f121c53
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-25 22:38:17 +03:00
Samuli Piippo
22f55689b5 sdk: use pkg-config from the sdk
Add needed envs to the default toolchain file used when
the setup-environment-* script have not been used.

Fixes: QTBUG-93896
Pick-to: 6.1
Change-Id: I5dc1773152b87f0c11434643de75386ddd999f72
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-05-25 22:38:07 +03:00
Samuli Piippo
81da43f922 qtmultimedia: update revision
Fix build without opengl.

Change-Id: I8b09d82b86b116b8f67e2dc03bd5f7a276fe9059
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-18 11:15:17 +03:00
Samuli Piippo
3a62aa21eb qtcharts: update revision
Fixes build without opengl.

Change-Id: Ic6e893fcca5d66c4c25e8c42311ac876ae8273ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-17 09:01:41 +03:00
Samuli Piippo
e0413e41f1 qtmultimedia: disable vivante plugin
The vivante videonode plugin doesn't compile.

Change-Id: I03ebb6021c91b39eeb1104e7545f238c263b236f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-12 15:35:02 +03:00
Samuli Piippo
5462fb39c5 qtconnectivity: include sdpscanner to packagegroup
Qt Bluetooth uses a separate executable, sdpscanner, to integrate
with the BlueZ. Include it into the packagroup if bluetooth is
enabled in the DISTRO_FEATUREs.

Change-Id: Ib14fd60d52c002b8ac283217316d902690373359
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-12 08:03:13 +03:00
Samuli Piippo
7ec2742246 Enable ptest support for Qt modules
Build tests for ptest in Qt modules. The default build using
PACKAGECONFIG[tests] doesn't work as the installation of tests is
not working correctly. Instead build the tests separately after
the module has been built and installed.

The tests have dependencies to the data and source files which
need to be packaged with the test binaries.

Change-Id: Ibae55a29135267ce96949aa0c15ad7e236ef2512
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-12 08:03:07 +03:00
Samuli Piippo
5ce04254ae qtbase: use bfd linker
Configure Qt always to use bdf linker instead of gold linker, which
has issues with some of code in Qt:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304

Change-Id: I743e4b4ed882f936af47a7f5a3b13f24b0635426
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2021-05-12 08:02:50 +03:00
Samuli Piippo
c7108eb5a1 qtbase: move all tools to same package
Some of the tools were moved to libexec, package all of those
into the tools package.

Pick-to: 6.1
Change-Id: Ib8d3dbe1821591101febf0ecedc526edc9b56366
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-12 08:02:43 +03:00
Samuli Piippo
f94e2908f1 qt6: update submodules
Latest from dev branches.

Assimp is used from upstream/master branch which contains
fix for missing exception header.

Change-Id: I21ef3f62caed80391fbaa301bf972e659a6fa6fc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-05-12 08:02:33 +03:00
Samuli Piippo
6bc012655f qt6: update submodules
Latest from dev branches.

Change-Id: Iceda025a694ba3b179ce9881b194c47d43a1f529
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-23 09:23:48 +03:00
Samuli Piippo
b4b672964c Don't append BBCLASSEXTENDs
Be consistend about BBCLASSEXTENDS, there is no need to append them.

Change-Id: I3b5838b23a6141b96fe7bdb128071335ec27a315
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-21 08:18:25 +03:00
Samuli Piippo
8dc000f55e qt5compat: BBCLASSEXTEND to native and nativesdk
Pick-to: 6.1 6.0
Change-Id: I73f9ba30cfce8b6d65aaf57087788aa400c54264
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-21 08:18:18 +03:00
Samuli Piippo
89475754d3 Add recipe for Qt Multimedia
Qt Multimedia is still in WIP status.

Task-number: QTBUG-91411
Change-Id: I8e06e44ef58e260fb8cf6dd25f694cb405018d2a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-04-08 13:05:32 +03:00
Samuli Piippo
4325285fb9 qtquick3d/qt3d: fix assimp handling
Use correct branch for assimp on QtQuick3D and Qt3D and include
the assimp lisense file. Fix system-assimp PACKAGECONFIG, but
don't enable it since the the default assimp available in oe-core
is too old for QtQuick3D.

Pick-to: 6.1
Change-Id: Iee959777b8f192a6512b2568ba7f6fa94a120535
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-08 09:09:06 +03:00
Samuli Piippo
2b362f5273 qt6: update submodules
Change-Id: Ia914ed3d0527ea1cb681048067919adf7c3fb8ac
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-07 16:40:39 +03:00
Samuli Piippo
c9da0eaec3 Update CI build
Hardknott Yocto version is now available, add it to the CI builds.
Only dev branch remains tested against Yocto master.

Change-Id: Iec1227d616ff95b8406217f4d18ebfba80a0300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-07 13:34:18 +02:00
Samuli Piippo
dfa089d0dc qtbase: don't force QT_HOST_PATH for SDK
Set QT_HOST_PATH to the SDK path only if it has not already been set.
This allows using the SDK to rebuild Qt using different host Qt.

Task-number: QTBUG-92052
Pick-to: 6.1 6.0
Change-Id: I39991ef6d95d0f9e21590dc8dccb39ec8107d8c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-07 08:15:28 +03:00
Samuli Piippo
9923954c23 qtcharts: update revision
... to allow build without opengl and to make qtdeclarative dependency
optional using PACKAGECONFIG.

Pick-to: 6.1
Change-Id: Idc8e73e38c9eb10f2f18c547530654a7c6e3f19f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-26 09:54:42 +02:00
Samuli Piippo
2eecf07106 coin: enable examples for all Qt modules
Pick-to: 6.1
Change-Id: I9ea4d3a639c53040eb412f1f90aa91560f6a9879
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-25 09:16:12 +02:00
Samuli Piippo
019581cff7 qttranslation: recommend all translation packages
Add RRECOMMENDS for all the dynamic translation packages to the main
qttranslation package to allow easily include all translation files
in the image.

Pick-to: 6.1
Change-Id: I564d4fe704a8b88e14d94154c3283e58d52ddb21
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-25 09:16:05 +02:00
Samuli Piippo
e60fed4f98 Split modules into essentials and addons
Add separate packagegroup recipes for essential and addon
Qt modules and make sure all modules are included in those.
Avoid unnecessary dublication with packagegroups and remove
the toolchain target packagegroup, instead use the combined
qt6-modules packagegroup for the toolchain as well. This will
install all development packages as long as SDKIMAGE_FEATURES
has dev-pkgs enabled.

Task-number: QTBUG-91902
Pick-to: 6.1
Change-Id: I574da02ae1632c1e41490a1244398f31eaeeb97b
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-03-25 09:15:58 +02:00
Samuli Piippo
629e44806b qt6: update submodules
Change-Id: I62a11908069c1140a7d920d5f5339bd5c31a1f6b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-25 09:15:44 +02:00
Mikko Gronoff
b13445afca Update Qt License Agreement 4.2.1 -> 4.3
Update The-Qt-Company-Commercial license 4.2.1 -> 4.3.

Task-number: QTBUG-72434
Pick-to: 6.1 6.0
Change-Id: I6a80b9f1f709d9f78f47a5ac78f9644734e835d6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-03-23 06:28:52 +00:00
Mikko Gronoff
162d983753 Add hardknott to LAYERSERIES_COMPAT
Pick-to: 6.1 6.0
Change-Id: I07f17e1e63df6e71cf1d4e68f353198093ae6826
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-03-22 08:17:58 +00:00
Samuli Piippo
212ae9b201 Use bindir for tools on Windows SDK
Move all the builttime tools back to bindir when building a Windows
SDK. This saves us from adding mingw libraries to the libexec dir
needed by the tools.

Fixes: QTBUG-91895
Pick-to: 6.1
Change-Id: I4da0f03190e3862e93c49fbd267baf567bf7a5d5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-18 14:45:31 +02:00
Samuli Piippo
0a096d1814 Add recipe for Qt Positioning
The git repository is shared with Qt Location module, but this recipe
builds only the Qt Positioning module.

Change-Id: I82d18b8b11ea35f7c65f3564443b196f69712325
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-17 08:01:31 +02:00
Samuli Piippo
67c94eee72 Add recipe for Qt SCXML
Pick-to: 6.1
Change-Id: I25a4a980b9aff1e15585c8c1bba4459e74fa266f
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-03-17 08:01:17 +02:00