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 /scripts | |
| 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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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" |