Commit Graph

178 Commits

Author SHA1 Message Date
Mikko Gronoff
16e8e1df79 qt6: update submodules
Update to latest content in Qt 6.0 branch.

Task-number: QTBUG-92335
Change-Id: I599a49f210ae445d45dcaf33bc86be5a85fcb662
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-29 11:34:11 +03:00
Samuli Piippo
e11ec7f68d qt5compat: BBCLASSEXTEND to native and nativesdk
Change-Id: I73f9ba30cfce8b6d65aaf57087788aa400c54264
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8dc000f55e)
2021-04-22 08:49:52 +03:00
Mikko Gronoff
1dcedd1b5d qt6: update submodules
Update to latest content on Qt 6.0 branch.

Change-Id: I67488221829ef51328307afe04e1011e180a8b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-13 09:57:34 +03:00
Samuli Piippo
ac739608b4 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>
(cherry picked from commit c9da0eaec3)
2021-04-08 09:37:37 +03:00
Samuli Piippo
a37b0c904d 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
Change-Id: I39991ef6d95d0f9e21590dc8dccb39ec8107d8c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit dfa089d0dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-07 11:30:59 +00:00
Mikko Gronoff
76043f9679 qt6: update submodules
Update to latest content in Qt 6.0 branch.

Task-number: QTBUG-91657
Change-Id: I5f1fab821f50fd252ddea1db4d183ee86a25c55e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-26 17:31:53 +02:00
Mikko Gronoff
955960a76a qt6: update submodules
Update to latest content in Qt 6.0 branch.

Task-number: QTBUG-91657
Change-Id: I328138f5b4effb2c82be152fbc70ebf05384048b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-03-23 12:48:05 +02:00
Mikko Gronoff
6efbb900c9 Update Qt License Agreement 4.2.1 -> 4.3
Update The-Qt-Company-Commercial license 4.2.1 -> 4.3.

Task-number: QTBUG-72434
Change-Id: I6a80b9f1f709d9f78f47a5ac78f9644734e835d6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b13445afca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-23 07:11:47 +00:00
Mikko Gronoff
ac58d3c789 Add hardknott to LAYERSERIES_COMPAT
Change-Id: I07f17e1e63df6e71cf1d4e68f353198093ae6826
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 162d983753)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-22 14:41:20 +00:00
Samuli Piippo
ed26c8d8b4 qmake: fix example PACKAGECONCIG for qmake projects
The default PACKAGECONFIG[examples] only works for cmake projects,
add correct arguments when using qmake projects. Skip QA check for
dev libs (.so) in example packages.

Change-Id: I559395f3bfcb64d54e2f8ede4bbdf07c5aa617e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 1933970950)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-12 10:15:25 +00:00
Mikko Gronoff
37497918aa qt6: update submodules
Update to latest content in Qt 6.0 branch.

Task-number: QTBUG-91657
Change-Id: I279290c185e3210cedb1582786ee8e6e139100c4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-03-12 10:12:09 +02:00
Samuli Piippo
a4dc2f99cd qtbase: remove scripts that cause file-rdeb QA issues
Remove unneeded macOS and Android specific scripts that depend
on perl and bash which then cause file-rdeps QA issues.

Change-Id: I877461fdcffc4fee5b29e929ad8ac2d30a2e980a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fe0c4887c3)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-02-25 13:00:46 +02:00
Mikko Gronoff
79c04dff6a qt6: update submodules
Update to latest content in Qt 6.0 branch
(first proposed 6.0.2 RC).

Task-number: QTBUG-90587
Change-Id: Ia23bb52352dffeeb4d5a0651c5da013eee17728d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-02-25 13:00:35 +02:00
Mikko Gronoff
7134e31081 qt6: update submodules
Update to latest content in Qt 6.0 branch.

Task-number: QTBUG-90587
Change-Id: I0bb03c98c24777822ee24bb909211cac095e133b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-02-23 13:07:39 +02:00
Samuli Piippo
71105310ef qtbase: remove cmake version override
The minimum required cmake version is now 3.16, no need to
override it anymore.

Change-Id: Id31d5a88e61e0dc4f2a78448482c61a894a59d94
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7057c72ca9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-16 10:45:11 +00:00
Samuli Piippo
ea84ba8943 Update branch information
Add 6.1 branch information to the CI testing table.

Change-Id: Ibc394287ef6dd89fabfe23a6ea99746804a61507
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit af28e2cec7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-12 12:09:22 +00:00
Mikko Gronoff
93d6245dae update inherit order in nativesdk-packagegroup-qt6-toolchain-host.bb
fix QA Issue: "nativesdk-packagegroup-qt6-toolchain-host:
native/nativesdk class is not inherited last, this can result in
unexpected behavior"

Change-Id: I393865b94d6f37ed815c41155a352b4f6b8b29fe
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4ed1c29264)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-10 07:34:32 +00:00
Mikko Gronoff
35612915ad qt6: update submodules
Update to latest content on Qt 6.0 branch.

Task-number: QTBUG-90587
Change-Id: I31ac5db021ce07f2d72a2461ef9ce0eed9c7b153
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-02-10 09:00:51 +02:00
Samuli Piippo
3dcb854bcf qtbase: remove circular dependency
After oe-core commit c4257ed8b1040a5a0e9a95846d81961741239116, the DEPENDS
are not cleared in native packages, which causes qtbase-native to have
a circular dependency.

Fixes: QTBUG-91043
Change-Id: Ie741f7d2a71ce00392e34c2d98faa944ac489574
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5aa68606d5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-09 20:11:45 +00:00
Mikko Gronoff
4c19929d7d qtopcua: update revision
One more module update for Qt 6.0.1 RC2. Amends commit
c6e8f6c657.

Task-number: QTBUG-89461
Change-Id: I864e7ebec5002419414f0aeb6e8727811d1090f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-01-29 20:05:50 +02:00
Mikko Gronoff
c6e8f6c657 qt6: update submodules
Update to latest content in Qt 6.0 branch (Qt 6.0.1 RC2).

Task-number: QTBUG-89461
Change-Id: I3597a8155d08421e2b9fc3105152b9801bfacb54
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-01-28 12:30:49 +02:00
Mikko Gronoff
04b1141046 qt6: update submodules
Update to latest content in Qt 6.0 branch (new Qt 6.0.1 RC).

Task-number: QTBUG-89461
Change-Id: I1a593c415c6803740ffcac8d6b6c02eaa67635d3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-01-22 08:35:52 +02:00
Mikko Gronoff
c3b78b9fc5 qtquick3d, qt3d: update recipes for new assimp SRC_URI
Assimp submodule has been moved from github to code.qt.io mirror.

Change-Id: I23cb8a24c01e0cd1b805e41bae329351707c374b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b412b6013f
 and adjusted for correct branch in current qtquick3d (6.0))
2021-01-22 08:35:47 +02:00
Samuli Piippo
b2a5780231 Add QMAKE_AR_LTCG
Amend 438c538fd285b33406633574f65dd5045baf8134 with QMAKE_AR_LTCG which
is needed when using LTCG configure option. Cleanup unused variables:
QMAKE_NM has never been used and QMAKE_CFLAGS_ISYSTEM is no longer used.

Change-Id: Icdb9ba48f867ff30066d8fda0c223cc3b2be2c2d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 21c1abd75b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-01-20 18:32:37 +00:00
Samuli Piippo
3717b45015 Add QMAKE_OBJCOPY and QMAKE_NM to mkspec
Needed to use the correct cross-compiler tools for objcopy and nm.

Fixes: QTBUG-90256
Change-Id: I38048033b17d388b86612bc7205c4e22d948be29
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit ac8056ef0e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-01-18 10:41:45 +00:00
Mikko Gronoff
25ee0bde7d qt6: update submodules
Update to latest content in Qt 6.0 branch (Qt 6.0.1 RC).

Task-number: QTBUG-89461
Change-Id: I39825228a7adb3e24bdae3acf3febd48e400a712
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-01-17 22:42:32 +02:00
Samuli Piippo
336a2fd3ad qtbase: enable zstd support with openembedded layer
Enable zstd compression support by default, if meta-oe layer
is included in the build.

Change-Id: I343594025c3850dd2bfd54b6a476c3dfec320c57
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 083d1441cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-01-14 16:50:45 +00:00
Mikko Gronoff
e46014acc4 qt6: update submodules
Update to latest content in Qt 6.0 branch (snaphot for 6.0.1)

Task-number: QTBUG-89461
Change-Id: Ia1c31a0c66250cfb4864fc2de001d40394790851
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-01-08 12:06:25 +02:00
Mikko Gronoff
e089f6cfc8 qt6: update submodules
Update to latest content in Qt 6.0 branch (snaphot for 6.0.1)

Task-number: QTBUG-89461
Change-Id: Ife8a3af54406997039824bc7a4ef3204d2cb8418
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-01-04 09:23:39 +02:00
Samuli Piippo
a2412b6199 coin: use unique hostname in CI machines
NFS uses hostname as the client id and doesn't work properly
if more than one VM is using the same hostname. Change to unique
hostname before mounting the cache.

Change-Id: I58791d8eecc22589dc39a9e21a3b3a40afdfd905
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 876480f7ce)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-01-04 07:22:00 +00:00
Mikko Gronoff
5948347dbd qt6: update submodules
Update to latest content in Qt 6.0 branch (snaphot for 6.0.1)

Task-number: QTBUG-89461
Change-Id: I1448b89b72f72f12c5bda67e7ab0bff4f807fc94
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-12-18 10:28:38 +02:00
Mikko Gronoff
248392d985 qt6: update submodules
Update to latest content in Qt 6.0 branch (snaphot for 6.0.1)

Task-number: QTBUG-89461
Change-Id: I5380dc0c1c1bb6f97118fefe4b4c56bda4f56f63
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-12-16 20:34:53 +02:00
Mikko Gronoff
aaa3b77573 qt6: update submodules
Update to latest content in Qt 6.0.0 branch.

Change-Id: I378320c1812420975debcb8b9cf572703f6197fb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-05 17:22:12 +02:00
Mikko Gronoff
bb03bf6e28 qt6: update submodules
* Update to Qt 6.0.0 RC2
* For non-essential Qt modules, change branch from dev to 6.0.0 where
  branching has been made

Task-number: QTBUG-86349
Change-Id: If641367ecc0113296c5cf60e2ff67bfab56942ae
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-02 07:24:57 +02:00
Samuli Piippo
2bb3541bcb qtcoap: examples depend on qtdeclarative
Change-Id: I2bd33f3502bfd7b2034ddbd6aef3f283d3a6f103
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-27 07:27:18 +02:00
Samuli Piippo
47c530b5e0 qt3d: add dependency to qtshadertools
Build needs to have both target and native as dependency.

Change-Id: Ib8f01b30822e1e3d2f170297b620c352819e77ca
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-27 07:27:12 +02:00
Samuli Piippo
ecc126ed6e qtimageformats: add PACKAGECONFIGs for all imagetypes
Support for mng cannot be enabled, default to formats available from oe-core.

Change-Id: I9ed3e8b9e173f13a67fef4832aa6ef42681f7285
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-27 07:27:06 +02:00
Samuli Piippo
181b94d709 qtbase: update PACKAGECONFIGs
Add configuration for odbc and brotli, and use system sqlite
if enabled.

Change-Id: I7065bb00be3aa60e438a55c78a8361d102262e0e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-27 07:26:59 +02:00
Samuli Piippo
59d929603c Update example and test PACKAGECONFIG
The CMake options were renamed.

Change-Id: Ib4bc6019b75b422d22306a8d5129512171008705
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-27 07:26:52 +02:00
Samuli Piippo
b1adc3fa3a Update readme
Add note about supported yocto branches using markdown syntax, rename
the file to match.

Change-Id: Ic7e4a8d8a910ab75f1c43b05132ee22805b763ef
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2020-11-25 08:50:04 +02:00
Mikko Gronoff
03489c6d85 qt6: update submodules
Update to Qt 6.0.0 RC

Task-number: QTBUG-86349
Change-Id: I31296ec03824c5a3c4a4e3b416296f8dd0fb3d43
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-25 08:46:51 +02:00
Mikko Gronoff
4ee65d5e60 qt6: update submodules
- Update to proposed Qt 6.0.0 RC content
- Set dev branch for non-official qt6 modules
- Re-enable qtopcua module

Task-number: QTBUG-86349
Change-Id: Ibb1a15796e572fe2407ba436c0d2b318a0be9352
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-11-24 11:39:04 +02:00
Samuli Piippo
4246a8afaa qtbase: update opengl PACKAGECONFIGs
Remove patch and add separate PACKAGECONFIG for disabling opengl.
Rename desktop opengl to gl to match what meta-qt5 is using.

Change-Id: I3308efd0717da79c813dcbc681787d47932a7f3e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-17 12:46:25 +02:00
Mikko Gronoff
7631ce8e65 qt6: update submodules
* Update to Qt 6.0.0-beta5 content.
* Add patch from codereview for qt3d to build against beta5
  content.
* disable qtopcua module temporarily due build issues against
  beta5 content.

Task-number: QTBUG-86349
Change-Id: I0665d1c3df5d8dee1dbaac89a7973d5f22c5a8ad
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-11-17 09:25:09 +02:00
Samuli Piippo
9bd853d4fe Add bbclass for disabling unsupported modules
The bbclass can be used to temporarily disable build of a broken
Qt module recipe without breaking the CI, packagegroup or toolchain
builds that include it.

Change-Id: I3a3e4b72350521b16f1c4fe50f423146ad86515d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-16 22:04:43 +02:00
Mikko Gronoff
4d1dc35397 qt6: update submodules
Update to actual Qt 6.0.0-beta4 content instead of older beta4
candidate.

Amends commit 70b967d5c1.

Task-number: QTBUG-86349
Change-Id: Ifcd7972758fc0eb8f9cc49b3522f1c3c3f35cf7f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-12 10:07:30 +02:00
Samuli Piippo
d48f680374 coin: update CI builds
Expand CI builds to multiple yocto versions. In addition to current
dunfell builds, test also against gatesgarth and master branches.

Use different sstate-cache than other yocto builds to make
cache cleanups simpler.

Task-number: QTBUG-88313
Change-Id: I75ff327850c65a75aeead41564aa516dabf05c8e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-11 18:04:24 +02:00
Samuli Piippo
9e6becf2a4 Add gatesgarth into LAYERSERIES_COMPAT
Change-Id: I38a3188bd87a1857a98ce08dcf788bff3ae16342
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-11 18:04:19 +02:00
Samuli Piippo
7f693407b7 qtbase: avoid using CMake's archiving
If CMake 3.18 is not build with system zstd then Qt build will fail when
file(ARCHIVE_CREATE) is called. Avoid this until zstd is available in
oe-core and cmake-native is build with it.

Change-Id: I5fb7c75f873b493bb183804dc835a40c46839a2b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-11 18:04:14 +02:00
Mikko Gronoff
70b967d5c1 qt6: update submodules
Update to Qt 6.0.0-beta4 content.

Set lower minimum required cmake version in qtbase recipe
as qtbase requires newer one than yocto dunfell branch has.

Task-number: QTBUG-86349
Change-Id: I40082e30d722d9989782530700f66aa91bd8eca1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-11-10 17:12:42 +00:00