diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-30 12:10:07 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-04 23:10:03 +0200 |
| commit | 27c10f248765d736bc45fd7d9ff6afd609a804fc (patch) | |
| tree | 9f1d2d9e98f240d8857d64fd30975853177f8cbe /recipes-qt/qt5/qtscript_git.bb | |
| parent | c017b5dc4c3d3e59f64c3beb7316335f6d341ee4 (diff) | |
| download | meta-qt5-27c10f248765d736bc45fd7d9ff6afd609a804fc.tar.gz | |
qt5: update submodules
* Update to latest content in Qt 5.15 branch
* Exclude qtwebkit recipe from CI & toolchain as it does not build
with latest 5.15 content
* Remove qtwebkit dependency in qtcreator recipe, it is not needed
anymore
Task-number: QTBUG-80823
Change-Id: I4e98c56749f5f5cd24efbd1e021b39e3947954a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtscript_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index c7c22f46..6da728a8 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
| @@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
| 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
| 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 38 | 38 | ||
| 39 | SRCREV = "4579c6eba8ca323f98b25a5aa8032a771e857c2b" | 39 | SRCREV = "b9168439a185755ef9110ffb898ab14f4e19cfcb" |