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/qtlocation_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/qtlocation_git.bbappend')
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bbappend | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index a318e4e..0e72b71 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend | |||
@@ -23,5 +23,3 @@ PACKAGECONFIG += "gypsy" | |||
23 | 23 | ||
24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" | 24 | EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" |
25 | DEPENDS_emulator += "qtsimulator" | 25 | DEPENDS_emulator += "qtsimulator" |
26 | |||
27 | SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec" | ||