aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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.2' in yocto/meta-qt6Qt Submodule Update Bot2022-03-141-36/+36
| | | | | Change-Id: Ie83d625e9e68e54ebacc86c3d7789182046b544b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-03-111-36/+36
| | | | | Change-Id: Ie7ccf01b76357b96e93a0027ceeb7f2e9b1e2268 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>
* 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) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* 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)
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-03-081-36/+36
| | | | | Change-Id: I1ec7b7f1aa1a0709ba32b8d49fd76a83d823e019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "qtbase: add patch for cross-compilation build"Samuli Piippo2022-03-082-52/+0
| | | | | | | | This reverts commit e31b6352a04f2d53f66d38fc2cfb25de5113611e. The patch was merged into qtbase. Change-Id: I0b342b99cd97a71f358f9e57dee53634e2972de5 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-03-081-38/+38
| | | | | Change-Id: I61eaa91d9e05c8455f272750943ec760c187ee89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* licenses: add SPDX license mapping to old license namesSamuli Piippo2022-03-081-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>
* meta: update license namesMartin Jansa2022-03-0837-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: Samuli Piippo <samuli.piippo@qt.io>
* 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>
* 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: add patch for cross-compilation buildMikko Gronoff2022-02-212-0/+52
| | | | | | | | Add patch that amends cmake related change included in latest submodule update. Change-Id: Ifdba80854f28277d40bc245e7a01eac9b7bc4998 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qtwebview: update license & checksumsMikko Gronoff2022-02-211-4/+5
| | | | | | Pick-to: dev 6.3 6.2.4 Change-Id: I061c2c6a2267fea2bb8c613de2da0c33a5059446 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qtbase: update license agreement checksumMikko Gronoff2022-02-211-1/+1
| | | | | | Pick-to: dev 6.3 6.2.4 Change-Id: I76d6a0a4576d3a8430060d42845e4ca4b5fd7219 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-02-211-37/+37
| | | | | Change-Id: Iee18d0bbe3878939791d3033162a9826960222c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtquickdesigner-components: add dependency to native-qtdeclarativeSamuli 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>
* licenses: be explicit about BSD licenseSamuli Piippo2022-02-1127-27/+27
| | | | | | | | 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)
* Revert "qtwebengine: disable webrtc-pipewire support"Samuli Piippo2022-02-111-0/+1
| | | | | | | | This reverts commit d19c1d8cf99ba6625136339bcda59b0ea0b1881c. The issue has now been fixed. Change-Id: Id5fad9cb5eadc04441ae6963b90f482cbe10911d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtwebengine: update patchSamuli Piippo2022-02-111-3/+3
| | | | | | Change-Id: I4b521099b2283943b893d841c5f2d12e2fbbce01 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 2394565194a0d066b0bb304aec92164db285d17b)
* qtapplicationmanager: update revisionSamuli Piippo2022-02-111-1/+1
| | | | | Change-Id: I072d8f155612684563da9ad4c7912d6b1340489f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-02-111-35/+35
| | | | | Change-Id: Ia6853ecd12c2f929dcac9dd9ab0a53551124b911 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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>
* qtquickdesigner-components: update moduleMikko Gronoff2022-02-101-1/+1
| | | | | | | | Update to latest revision in dev branch. Change-Id: If12c3f3071f208c2ab1e1a5d63697b2e9a071c57 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit e4e5b75e22db513ea21a69311ee5297779e225a7)
* 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>
* qtwebengine: skip QA issueSamuli Piippo2022-02-091-0/+4
| | | | | | | | | Fix QA Issue: qtwebengine: ELF binary /usr/lib/libQt6WebEngineCore.so.6.2.4 has relocations in .text [textrel] Change-Id: I46fae1212efa0680cec2bfbc29f21800195176d2 (cherry picked from commit 57b22c6ea036297ce0db45823b1971ef9398f576) Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Coin: build webengine without system ffmpegSamuli Piippo2022-02-091-1/+1
| | | | | | | | oe-core/master has incompatible ffmpeg version, instead use the chromium's own version. Change-Id: Ic14b85d6f07fd538c18bbb97647fb9bc9c923cb9 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Coin: use manifest to fetch meta layersSamuli Piippo2022-02-091-13/+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)
* 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>
* qtbase: remove unneeded patchSamuli Piippo2022-02-032-59/+0
| | | | | | | | Catch2 was updated in qtbase, patch is no longer needed. Pick-to: dev 6.3 Change-Id: I762e27a49ddcc325c5911e36bb65aab24b0b78cb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtwebengine: update license checksumSamuli Piippo2022-02-031-1/+1
| | | | | | | Change-Id: I9e19340b783fefd3cb3ea9d523354e022e131638 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 81daff59ceb01248f5a1e35470c6620e834c9261) Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-02-031-37/+37
| | | | | Change-Id: Id4a8302bebe9fc15eb6f682bffc95d2853acab77 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtwebengine: disable webrtc-pipewire supportSamuli Piippo2022-02-031-1/+0
| | | | | | | | Temporarily disable support for webrtc-pipewire feature due to QTBUG-100435. Change-Id: I77191b7c9ed6fd8f598191e37517985263e41281 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* 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>
* 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>
* qt6-cmake: inherit pkgconfigSamuli Piippo2022-02-0110-10/+10
| | | | | | | | | | Static build needs pkgconfig for every Qt module. Include it already in qt6-cmake class instead of in each individual module. Change-Id: I065382ee49d6b40b76ede9e632d17221451de8d1 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit cbac31ee9090e3e0e1c81b7e1458410deece1331) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qt6: add packaging rule for static pluginsSamuli Piippo2022-02-011-0/+1
| | | | | | | Change-Id: I7f511470d3de6ae25eb4631de38b18fe347bcdfd Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit c8499a81b5919fc28b184086ba1934784d0eb3a2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qt6-git.inc: Bump PV to 6.2.4Mikko Gronoff2022-01-281-1/+1
| | | | | Change-Id: I09b7433685e7a40e0d5efe152c1ba1237366696a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt6-cmake: remove unncessary directory separatorSamuli Piippo2022-01-201-2/+2
| | | | | | | Change-Id: Ie4ced4340bcf672cfbf7f034283beb53c93dbd92 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 17c05714ad710e343f83f4b4447f05c2aa28e16a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtdatavis3d: update licenseMikko Gronoff2022-01-201-1/+1
| | | | | | | | | Leftover from earlier license update change. Amends commit 21a91d465d5eb1d4a051dc0303df0e207d131181. Pick-to: 6.2.3 Change-Id: I0117fe38773d39f358475378030e017edabe0a17 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update submodule refs on '6.2' in yocto/meta-qt6Qt Submodule Update Bot2022-01-201-37/+37
| | | | | Change-Id: Ieb2e261738bf901ea1ef907e16db124a9202fcf1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtmultimedia: add dependency to qtsvg for examplesSamuli Piippo2022-01-201-0/+1
| | | | | | | | | Some examples have dependency to Qt SVG. Change-Id: I9084c4a4e321710aa60a6e5df351b37c3c1518cb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit a6e5979a1b7bce37d97ad66fb4a1f007933adc36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: disable CI build against upstream masterSamuli Piippo2022-01-201-1/+1
| | | | | | | | | meta-openebedded is currently broken due to nativesdk-python3-cryptography. Change-Id: I99fa9313c1c8d1196bc09a8755269ecffe75ce56 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 3da9ed068a2a191a4e9088b915234fb56c40eca3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* sdk: don't filter nativesdk packages with DISTRO_FEATURESSamuli Piippo2022-01-181-1/+2
| | | | | | | | | | | | | | The nativesdk builds have different set of DISTRO_FEATURES, which by default don't include wayland, even if it's used for target builds. Instead of filtering wayland packages based on the DISTRO_FEATUREs, always include them. The nativesdk packages builds correctly, even if wayland is not supported for the target. Fixes: QTBUG-99787 Change-Id: I9e00b5e4eacc340a985d0617911c02144ec3e6ed Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit a03cfa981d9f026f748d7802e924fc5d0c55edbe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 00:10:25 +0000