diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-07-08 09:32:50 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-07-09 13:13:30 +0300 |
commit | a544845978fc5d13cc2ca7c218d86c4cf82c3337 (patch) | |
tree | 65e09447dfc446832a2733c9acf905429c420198 | |
parent | 2f8ef2cf9fdb98c78634c445758a199a6c4bc21f (diff) |
metq-qt5: update layer
* Update to latest content in Qt 5.15 branch.
* Also inherit "rm_work" bbclass from yocto to save disk
space during build.
Task-number: QTBUG-84150
Change-Id: Iba92a64a5ac8b2aea5ec636258903e68c94878fe
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
-rw-r--r-- | meta-boot2qt-distro/conf/local.conf.sample | 4 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-boot2qt-distro/conf/local.conf.sample b/meta-boot2qt-distro/conf/local.conf.sample index c6db921f..dd880113 100644 --- a/meta-boot2qt-distro/conf/local.conf.sample +++ b/meta-boot2qt-distro/conf/local.conf.sample @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -277,7 +277,7 @@ BB_DISKMON_DIRS = "\ # this doesn't mean anything to you. CONF_VERSION = "1" -#INHERIT += "rm_work" +INHERIT += "rm_work" INHERIT += "image-buildinfo" INHERIT += "internal-build" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 41b841af..f73ae7d0 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -34,7 +34,7 @@ fetch="ssh://codereview.qt-project.org/yocto"/> <project name="meta-qt5" remote="qt" - revision="c2f3a17f625cd2e9d4f91a26b4fe15c16dfc5557" + revision="b18d39f2a9258dab8587e563086cdc7de08257c1" path="sources/meta-qt5"/> <!-- NXP --> |