From dc20529cd55600787c003f5db4c82352740c3cf6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 19 Feb 2018 09:51:58 +0200 Subject: meta-qt5: update meta layer - Pull in latest upstream/rocko commits. - Keep older qtsystems with old license files due emulator dependency Change-Id: I5c9c7cce77e1f308bd360dbe7b0b756a6e4e3203 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtsystems_git.bbappend | 9 ++++++++- scripts/manifest.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 57c8285..8ae3521 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,4 +30,11 @@ EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" DEPENDS_append_emulator = " qtsimulator" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6aa649c..48329fe 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/>