From 05151ec5797a7ce719b2888dec89d7e45a1fd182 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 17 Aug 2021 09:25:08 +0300 Subject: meta-qt6: update layer - Update to latest content in Qt 6.2 branch (beta3) - Remove quickcontrols2 references, the module was merged into qtdeclarative Task-number: QTBUG-91012 Change-Id: I20e4d1e67164b8bd0f5f0df02113d0075762d021 Reviewed-by: Qt CI Bot Reviewed-by: Samuli Piippo --- meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 1 - meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb | 2 +- scripts/manifest.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb index b8652c49..91f0d494 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb @@ -60,7 +60,6 @@ PACKAGE_EXCLUDE += "\ qtopcua-dev \ qtpositioning-dev \ qtquick3d-dev \ - qtquickcontrols2-dev \ qtquickdesigner-components-dev \ qtquicktimeline-dev \ qtremoteobjects-dev \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb index 28cf49f0..8cc7d286 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb @@ -44,7 +44,7 @@ SRC_URI += "\ file://startupscreen.service \ " -DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtquickcontrols2" +DEPENDS += "qtbase qtdeclarative qtdeclarative-native" S = "${WORKDIR}/git/startupscreen" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 54a11731..92b35458 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -33,7 +33,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> -- cgit v1.2.3