diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-06-13 08:42:52 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-11 07:14:08 +0000 |
commit | d7d6fcb2da15e49ad42b119f50b58a35c4b6498e (patch) | |
tree | 3f43cdf7432ca9f7cb381db6fb657338d1b65fd7 /recipes-qt/qt5/qtwayland_git.bbappend | |
parent | af576e137e0aa8bde0e6b4fcb8b4011fa0769277 (diff) | |
download | meta-boot2qt-d7d6fcb2da15e49ad42b119f50b58a35c4b6498e.tar.gz |
qt5: update meta-qt5
* Include merged upstream/krogoth content
* Include first 5.6.3 submodule update snapshot
* Use meta-qt5 submodule SHA1s directly instead of
meta-boot2qt overrides
* Clean obsolete/overlapping content from .bbappends
Change-Id: I3ae72197a64f67c1856210a45f5e49331e1cc03d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bbappend')
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bbappend | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend deleted file mode 100644 index b886d31..0000000 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" | ||