From b6dd26d488c1e9dd3339743e436dbdfa6fdc96e9 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 18 Oct 2018 10:44:09 +0300 Subject: 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 --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-boot2qt-distro') 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() { RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qt3d-tools \ - nativesdk-qtbase-tools \ - nativesdk-qtbase-tools-dev \ - nativesdk-qtbase-tools-staticdev \ + nativesdk-qtbase \ + nativesdk-qtbase-dev \ + nativesdk-qtbase-staticdev \ nativesdk-qtdeclarative-staticdev \ nativesdk-qtdeclarative-tools \ nativesdk-qtremoteobjects-tools \ -- cgit v1.2.3-54-g00ecf