diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-19 09:51:58 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-02 07:29:46 +0000 |
commit | dc20529cd55600787c003f5db4c82352740c3cf6 (patch) | |
tree | cc968f1824c0f6b084fa824d210b622917aa4ef2 | |
parent | 8d03cf7bde54707fe70f05be57983cfce4a8374f (diff) | |
download | meta-boot2qt-dc20529cd55600787c003f5db4c82352740c3cf6.tar.gz |
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 <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/qtsystems_git.bbappend | 9 | ||||
-rw-r--r-- | 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 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -30,4 +30,11 @@ | |||
30 | EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" | 30 | EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" |
31 | DEPENDS_append_emulator = " qtsimulator" | 31 | DEPENDS_append_emulator = " qtsimulator" |
32 | 32 | ||
33 | LIC_FILES_CHKSUM = " \ | ||
34 | file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
35 | file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
36 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
37 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | ||
38 | " | ||
39 | |||
33 | SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" | 40 | 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 @@ | |||
24 | path="sources/meta-openembedded"/> | 24 | path="sources/meta-openembedded"/> |
25 | <project name="meta-qt5" | 25 | <project name="meta-qt5" |
26 | remote="qtyocto" | 26 | remote="qtyocto" |
27 | revision="e721e84659869e4a04838d95d7cdbab9d48f5c3d" | 27 | revision="a96836aedf30d2e26fbcafc13b1313d1325a0730" |
28 | path="sources/meta-qt5"/> | 28 | path="sources/meta-qt5"/> |
29 | <project name="meta-mingw" | 29 | <project name="meta-mingw" |
30 | remote="qtyocto" | 30 | remote="qtyocto" |