aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qtquickdesigner-component: switch to CMake buildv6.3.06.3.0Samuli Piippo2022-04-061-1/+1
| | | | | | | Change-Id: I464f6cdedf02185876a57f4cafad47d5f60f10b4 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit e8102f036aced460ce6c8a85b13063d12e35ace9) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodule refs on '6.3.0' in yocto/meta-qt6Qt Submodule Update Bot2022-04-061-39/+39
| | | | | Change-Id: I1cca98c48160112e6defb7e2f820d2bfd908fa8f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qtbase: update license checksumSamuli Piippo2022-04-061-1/+1
| | | | | | | Change-Id: If4c6822c71e627d973b55f9edad382a4d6088acd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 910ec2e26033bcd14ac4e0731e283d059e5af3e5) Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update The-Qt-Company-Commercialv6.3.0-rcJani Heikkinen2022-03-241-4/+4
| | | | | | | | | Newest version is 4.4.1 so update it in the git as well Task-number: QTBUG-101714 Pick-to: 6.3 6.2 dev Change-Id: Ifd65867cc25abacd37bf1e90c0638bc50ac476b5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update submodule refs on '6.3.0' in yocto/meta-qt6Qt Submodule Update Bot2022-03-241-39/+39
| | | | | Change-Id: I45c12090ceaf23bcaa9077b6a9361dc51cb1314c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qt6: update branch to 6.3.0Samuli Piippo2022-03-241-1/+1
| | | | | Change-Id: I58907f9f7586840e0fa3b9e108b8806bb5956cea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qtdeclarative: include tools in packagegroupSamuli Piippo2022-03-241-0/+1
| | | | | | | | | | qtdeclarative-tools has runtime tools, such as qmlscene, that can be useful in the image. Change-Id: I359611f8a3e575d8b18b63c4f8a034ad5ab705a1 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit c3d4a5722f0f853a6280ffb3deb95cb01fd1e1fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtinterfaceframework: remove workaroundSamuli Piippo2022-03-231-7/+0
| | | | | | | | | | Kirkstone has been updated with working nativesdk-python3 builds and qtinterfacewramework can now be included in the SDK. Change-Id: Ibcaf520688a56f9607db89993aa9ec9e2d667844 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit bc0717a20b77bd0a0f9b3be6c0cfa3407208611f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-03-171-37/+37
| | | | | Change-Id: I8c3bfdf21257b7ae776b0edba680b708c034a357 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* sdk: add bin to PATHSamuli Piippo2022-03-161-0/+3
| | | | | | | | | | | | Prepend PATH env with the path to the bin directory in the cmake toolchain file. This let's CMake to find CMAKE_MAKE_PROGRAM (make or ninja) without need to specify it explicitly when using the qt-cmake* helper scripts. Change-Id: Ic7ce057421395d98158b3ad6e529f30b629bdded Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit eaee55e9fe7c7a5fc9747c144395c304688686f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* sdk: support cmake builds on WindowsSamuli Piippo2022-03-161-0/+4
| | | | | | | | | | CMake and Ninja combination does not support changing RPATH on Windows hosts, even when cross-compiling. Add CMake configuration to workaround this. Change-Id: I5d82c0a7f91cf81a0b3ed7c0f14aeccc36464f91 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 554b947ba4e5b5bbdf6b7ca39ce8a7e44b009c8a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtbase: enable scripts for mingw toolchainSamuli Piippo2022-03-161-0/+5
| | | | | | | | | | Make sure the qt-cmake* helper scripts get correctly created for mingw toolchains. Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 3d122c668c9330016bb057518cf825fbc80fc040) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtinterfaceframework: update workaround for kirkstoneSamuli Piippo2022-03-161-1/+1
| | | | | | | | | | Skip qtinterfaceframework also with kirkstone now that master branch is using kirkstone as DISTRO_CODENAME. Change-Id: I8ff7c9c3289d4f2c8864c14a6abcf61fe34250a6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit b32b7f27746f2d57e3d20ad837cb34510f6dbdfd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-03-141-36/+36
| | | | | Change-Id: I226081faea1229a0f33f360e0f62e94c5471e1fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodule refs on '6.3' in yocto/meta-qt6v6.3.0-beta3Qt Submodule Update Bot2022-03-121-37/+37
| | | | | Change-Id: I2f91760dda6b9b3d97e7e585d3faf6adda3b1c6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Create Conan profileSamuli Piippo2022-03-103-0/+61
| | | | | | | | | | | | | Generate Conan profiles that can then be used with the SDK. Task in qtbase generates profile that has all the architecture bits and configure arguments in place. The profile added in the SDK phase lets Conan recipes know how to use the SDK with the QT_CONFIGURE_MODULE environment variable. Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit a64c9789834fae95498f14debd077b95ac013ef6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-03-091-36/+36
| | | | | Change-Id: Ib76cf09ee4143aa1a441f898dc424ca59427347f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* sdk: resolve absolute paths in toolchain file at runtimeSamuli Piippo2022-03-092-5/+8
| | | | | | | | | | | | | MinGW toolchain doesn't perform relocation during installation, so all the absolute path point to the temporary sdk paths. Use the location of the toolchain file to get the absolute paths at runtime instead instead of using external SDKPATH env for it. Change-Id: I699b2178baf5cc855a57186056341b6c6eefbbf5 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 0ef2348d49be4e0de1e7fdb46406a9435254d8a1)
* sdk: rewrite cmake toolchain file without environment variablesSamuli Piippo2022-03-092-21/+48
| | | | | | | | | | | | | | | | | | | The default OEToolchainConfig.cmake uses environment variables to set all the cmake variables in place. The Qt6Toolchain.cmake chainloaded the same toolchain file after setting everything to env. Rewrite the Qt6Toolchain.cmake now to set all the cmake variables directly without using environment variables or chainloading the origin OEToolchainConfig.cmake. This allow better integration to QtCreator that might be used to modify the compiler flags for projects. Change-Id: I7c7c42ec17c86f53b62ed557d9b61d5d19abc1e0 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 5cbac6cf356b94db8dbadbc7b3b9149b6374ef72)
* qtdeclarative: update patchSamuli Piippo2022-03-071-5/+5
| | | | | | Pick-to: dev Change-Id: Ie993de39fa7838c3cec41febaae131fa01b6af0d Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-03-071-39/+39
| | | | | Change-Id: I059fa32fe0162f8cb585597827156ca3a5340fce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* licenses: add SPDX license mapping to old license namesSamuli Piippo2022-03-061-0/+5
| | | | | | | | | | | | | The common license files have been renamed to use SPDX names, but we still support some older yocto branches that use the old names. Add mapping to allow building with older yocto version after the recipes are updated to the new license names. This avoid warnings: No generic license file exists for: GPL-3.0-only in any provider Change-Id: Ib93baf9027442e69ab5bce294449bd203d9be2aa Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit f80f96848dfd0072c40448400898c5e0d5d16fe0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ptest: fix packaging of test dataSamuli Piippo2022-03-061-1/+1
| | | | | | | | | Use correct path for the test sources and data. Change-Id: I90f14130dce7f3b5ef3ae45dbdd60540c795ba9e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit d1ffa135a7150e210260b5ae37ebe22bf0ff369d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* meta: update license namesMartin Jansa2022-03-0637-37/+37
| | | | | | | | | | | * openembedded-core/scripts/contrib/convert-spdx-licenses.py . ... All files processed with version 0.01 Change-Id: Ife671a597eea9e1567d2b37d0aea25cc0b8e9012 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit d26bf4af06e492c28327271d0539b3fc29b36ede) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* srcrev_update: fix update task with latest fetcherSamuli Piippo2022-03-051-0/+1
| | | | | | | | | | | | | | | Additional check was added into the bb.fetcher that needs to be workaround in srcrev_update task. Otherwise task will fail with error: Exception: bb.fetch2.FetchError: Fetcher failure: Recipe uses a floating tag/branch without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE). Change-Id: Ib3c2665257c344c312074519a03d96437866cd8d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 6492c169550c3750fe6c93592b38f182bca2c609) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtwebview: update license & checksumsMikko Gronoff2022-03-041-4/+5
| | | | | | | Change-Id: I061c2c6a2267fea2bb8c613de2da0c33a5059446 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 89ba83fa7a997886c4b89098d4e3dab0518233c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtbase: update license agreement checksumMikko Gronoff2022-03-041-1/+1
| | | | | | | Change-Id: I76d6a0a4576d3a8430060d42845e4ca4b5fd7219 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit e0436d24f3db4c7324eaa4a0caecf6068c26c100) Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-03-041-38/+38
| | | | | Change-Id: I4dbe3083c876ed8365c96793fba308d9d8658346 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* layer: use the same priority as the core layerSamuli Piippo2022-03-031-1/+1
| | | | | | | | | | | | | Some of the python3 recipes we carry are already in meta-python layer, but not in all the branches that we support. In order to use the most recent recipe, we need to have same or lower BBFILE_PRIORITY than meta-python. Depending on the branch, meta-python's priority is either same or higher than the core layer's priority. Change-Id: I98c74858c5be69e45a76a45ed10aa1168c614618 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit d36033ca56e96d8843d9e733b50759f237021694) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* layers: Bump to use kirkstoneSamuli Piippo2022-02-241-1/+1
| | | | | | | | Fixes: QTBUG-101142 Change-Id: I85c5dbbfc10184108514dd01a3255018c0dc3db4 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 3ff5acc752767be6f5f887b07fe64371faad2090) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: adapt to variable renamingSamuli Piippo2022-02-244-5/+6
| | | | | | | | | | In kirkstone, some of the variable have been renamed to use inclusive language. Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 2d4825f3098fb82736b83744b8b2ac212785c894) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: use include files for configurationSamuli Piippo2022-02-246-24/+20
| | | | | | | | | | Restructure the Coin build configs so that all configurations are already in .inc files that can be easily included. Change-Id: I93d74254804b7d17106a3f08af2973464e669928 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 0708a33ea6a68d87a31189bc6560524056dd038c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtbase: update patchSamuli Piippo2022-02-151-5/+5
| | | | | | | | | Update patch to apply cleanly again. Change-Id: I235a321bdf05e6d74871f204dd154929478ecc3c Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 28c7a28568b7b965fbe3b3b12113396e510892e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtquickdesigner-components: add dependency to native-qtdeclarativev6.3.0-beta2Samuli Piippo2022-02-141-1/+1
| | | | | | | | | | native-qtdeclarative is needed to take advantage of qmlcachegen and qml script compiler. Change-Id: Ie78b3401a1f4dfe252970f8c0b1dea70c0c0c954 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 9471cb966ff5ec1314e93c014518ae6ba233a038) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* sdk: workaround failing nativesdk-python3-qface buildSamuli Piippo2022-02-141-0/+7
| | | | | | | | | | | | | | | | | | meta-openembedded/master has issues building certain python3 modules for nativesdk. For python3-qface, failure is from dependency chain: nativesdk-python3-qface -> nativesdk-python3-watchdog -> nativesdk-python3-requests -> nativesdk-python3-pyopenssl -> nativesdk-python3-cryptography Don't include qtinterfaceframework to sdk when using master branch with poky until all modules can be built correctly. Change-Id: Id2837f1363a22cb28e45c1165631cfa3f37756a7 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit b2ccd0bd602cd1d2679a0d48b964f2e43ed3d8e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-02-121-37/+37
| | | | | Change-Id: If34b474af4b1b84f7835bf6b214df586346bf6e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* licenses: be explicit about BSD licenseSamuli Piippo2022-02-1028-28/+28
| | | | | | | | | All references here to BSD actually mean BSD-3-Clause. Change-Id: Iec43070c5245d053259c215311f238989741c85d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 154c396c5726db3fbf46ea277a98e87401d04b6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* sdk: use relativate path with cmake toolchain fileSamuli Piippo2022-02-101-1/+2
| | | | | | | | | | | Paths in mingw toolchain are not relocated when installed, so we need to use relative path for the Qt6Toolchain.cmake file. Fixes: QTBUG-100642 Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit e78c281c0a0722228cae1169fff08691db1dbcd6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtdeclarative: re-enable ptestSamuli Piippo2022-02-101-1/+0
| | | | | | | | | This reverts commit fff02af10d9ea323cb267c981253ca37eb1ede53. Auto test build issue has been fixed. Change-Id: I55ef6f7aec1a5695089b1fb62e5b6aafb4299d70 Pick-to: dev Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtapplicationmanager: update revisionSamuli Piippo2022-02-101-1/+1
| | | | | Change-Id: I0ad22db23eb4a8574c56845fae2ef239298a56d1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Revert "qtbase: fix mingw nativesdk build"Samuli Piippo2022-02-102-26/+0
| | | | | | | | | This reverts commit 68bd9cee63eaf612c8b650c8b95697e54ac3851b. Proper fix has been merged to qtbase. Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29 Pick-to: dev Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qtwebengine: update patchSamuli Piippo2022-02-101-3/+3
| | | | | Change-Id: I4b521099b2283943b893d841c5f2d12e2fbbce01 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update submodule refs on '6.3' in yocto/meta-qt6Qt Submodule Update Bot2022-02-101-38/+38
| | | | | Change-Id: I06c173e70ca4fcc0e43d7428a3e3e6594c40d0ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtbase: remove unneeded patchSamuli Piippo2022-02-102-59/+0
| | | | | | | | Catch2 was updated in qtbase, patch is no longer needed. Change-Id: I762e27a49ddcc325c5911e36bb65aab24b0b78cb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 9080dc9fe082b29ffd7c1ff4e5f7b911c6f1dbfc)
* Fix a bug in LA 4.4Jani Heikkinen2022-02-091-1/+1
| | | | | | | | Fixes: QTPMO-1479 Change-Id: I86eefc98ad663141de840d54d713ef029ee28291 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 92b8d16b7319fc077a6aced77636699c2dc5f59b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ptest: allow ptest to be disabled for all Qt modulesSamuli Piippo2022-02-041-0/+3
| | | | | | | | | | | For static Qt builds, it's useful to allow disabling ptest for all Qt modules without removing ptest from DISTRO_FEATURES, since that would cause rebuild of most of the system components. Change-Id: I32aa202ce8e4a1260e287b0625495ef828536511 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit a730a1f029fd061294e644392e5cfe86307a7468) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: use manifest to fetch meta layersv6.3.0-beta1Samuli Piippo2022-02-021-12/+18
| | | | | | | | | | | | | | Use manifests to fetch meta layer repositories. This enables us to easily pin the upstream layers to specific revision if and when the latest revision gets broken. Build again against master branch, the manifest is pinned to working meta-openembedded revision. Change-Id: I5d217f6932aaf5eaacae8ccbc790ea31aaa27f37 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 688791f03daa283dc787d0bdbef8abfef4216825) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update The-Qt-Company-CommercialJani Heikkinen2022-02-011-970/+1632
| | | | | | | | | | Newest version is 4.4 so update it in the git as well Task-number: QTBUG-98971 Change-Id: I3b2086857e7c9b9cf7d44a40c080ae6bd03ca927 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 7017b2f1f63e06613fc5684d8cec69ef199c3b62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtpdf: force remove conflicting filesSamuli Piippo2022-02-011-3/+3
| | | | | | | | | | | QtPDF does not support static builds, but the build still passes ok in bitbake builds. Use force when removing the files, since they don't exists in static builds. Change-Id: I50cce6e277c25c32aa98804d5f3de6d25df12b25 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit e6fda09a6f664b52cd464fa6bbf309945287f2c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtinterfaceframework: fix packaging for static buildsSamuli Piippo2022-02-012-3/+3
| | | | | | | | | | | In static builds, we can't have the extra simulation and refapi packages first on the list, since the static libs would end up there as well. Use PACKAGE_BEFORE_PN to add the packages in proper order. Change-Id: I35976b90b12137caa7b7044f4aef40c229c75783 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit 7e1e9f892e71277f1584d6ec3ef3a8f7351c6c4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>