diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-18 10:44:09 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-19 11:19:48 +0000 |
| commit | b6dd26d488c1e9dd3339743e436dbdfa6fdc96e9 (patch) | |
| tree | 1ebcb7de9d34c305ed5ce0f4b8cdfb5559b37e38 | |
| parent | 4fd239fb7a352e676deecc2b81ed0e95db516cff (diff) | |
| download | meta-boot2qt-b6dd26d488c1e9dd3339743e436dbdfa6fdc96e9.tar.gz | |
meta-qt5: update layer
* Pull in latest upstream/master content via 5.11 -> 5.12 merge
* Update Qt 5.12.0 submodules to latest revisions, including fix for
unstable qtwebengine build (QTBUG-70914)
* Nativesdk packagegroup updated accordingly after default packages
change in upstream/master commit: "3224b02 nativesdk-qtbase: use default PACKAGES"
pulled in by merge commit 21f10e4 below.
Updates:
aecbcd8 qt5: update submodules
21f10e4 Merge remote-tracking branch 'qtyocto/5.11' into 5.12
Task-number: QTBUG-70847
Change-Id: I50cd486687a0fa8bb63d6960895ba7e6fc4fe3b3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 6 | ||||
| -rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 9f2d197..2adad90 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | |||
| @@ -42,9 +42,9 @@ python __anonymous() { | |||
| 42 | RDEPENDS_${PN} += "\ | 42 | RDEPENDS_${PN} += "\ |
| 43 | nativesdk-packagegroup-b2qt-embedded-toolchain-host \ | 43 | nativesdk-packagegroup-b2qt-embedded-toolchain-host \ |
| 44 | nativesdk-qt3d-tools \ | 44 | nativesdk-qt3d-tools \ |
| 45 | nativesdk-qtbase-tools \ | 45 | nativesdk-qtbase \ |
| 46 | nativesdk-qtbase-tools-dev \ | 46 | nativesdk-qtbase-dev \ |
| 47 | nativesdk-qtbase-tools-staticdev \ | 47 | nativesdk-qtbase-staticdev \ |
| 48 | nativesdk-qtdeclarative-staticdev \ | 48 | nativesdk-qtdeclarative-staticdev \ |
| 49 | nativesdk-qtdeclarative-tools \ | 49 | nativesdk-qtdeclarative-tools \ |
| 50 | nativesdk-qtremoteobjects-tools \ | 50 | nativesdk-qtremoteobjects-tools \ |
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index b5fa0b8..672845b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | path="sources/meta-openembedded"/> | 26 | path="sources/meta-openembedded"/> |
| 27 | <project name="meta-qt5" | 27 | <project name="meta-qt5" |
| 28 | remote="qtyocto" | 28 | remote="qtyocto" |
| 29 | revision="6aa1a8026b65c85a2ea35361939b6401f950cc2e" | 29 | revision="aecbcd8423e44b89bd187bf0ecf9caa14283e581" |
| 30 | path="sources/meta-qt5"/> | 30 | path="sources/meta-qt5"/> |
| 31 | <project name="meta-mingw" | 31 | <project name="meta-mingw" |
| 32 | remote="qtyocto" | 32 | remote="qtyocto" |