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/nativesdk-qtbase_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/nativesdk-qtbase_git.bbappend')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 7debc2e..057e1c3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | ## | 19 | ## |
| 20 | ############################################################################## | 20 | ############################################################################## |
| 21 | 21 | ||
| 22 | SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" | ||
| 23 | |||
| 24 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" | 22 | FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" |
| 25 | 23 | ||
| 26 | SRC_URI += "\ | 24 | SRC_URI += "\ |