diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-08-17 09:25:08 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-08-18 07:56:40 +0300 |
| commit | 05151ec5797a7ce719b2888dec89d7e45a1fd182 (patch) | |
| tree | 99f6e4a0f20819a7866076dc3c17dfbe79d239f0 | |
| parent | 76e790fe3045d8b0432ccee5da6b3c3837125ba0 (diff) | |
meta-qt6: update layerv6.2.0-beta3
- 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 <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 1 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb | 2 | ||||
| -rw-r--r-- | 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"/> <project name="meta-qt6" remote="qt" - revision="34f86eb73c1c8a5daa38bee367e2978f25a7ecf8" + revision="3b3572a59c5b697e423b242b17d410685432711e" upstream="6.2" path="sources/meta-qt6"/> |