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 /coin | |
| 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 'coin')
| -rw-r--r-- | coin/module_config.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index e467be40..6ce600eb 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml | |||
| @@ -92,6 +92,8 @@ build_instructions: | |||
| 92 | RDEPENDS_${PN}-dbg_pn-x11-common = "" | 92 | RDEPENDS_${PN}-dbg_pn-x11-common = "" |
| 93 | # to fix apm, fso-apm conflict in shr-image-all | 93 | # to fix apm, fso-apm conflict in shr-image-all |
| 94 | VIRTUAL-RUNTIME_apm = "fso-apm" | 94 | VIRTUAL-RUNTIME_apm = "fso-apm" |
| 95 | # remove qtwebkit-dev | ||
| 96 | USE_RUBY = "" | ||
| 95 | # require conf/distro/include/qt5-versions.inc | 97 | # require conf/distro/include/qt5-versions.inc |
| 96 | # QT5_VERSION = "5.4.0+git%" | 98 | # QT5_VERSION = "5.4.0+git%" |
| 97 | # for qtwebkit etc | 99 | # for qtwebkit etc |
| @@ -156,6 +158,7 @@ build_instructions: | |||
| 156 | # EXCLUDE_FROM_WORLD | 158 | # EXCLUDE_FROM_WORLD |
| 157 | rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb | 159 | rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb |
| 158 | rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb | 160 | rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb |
| 161 | rm -r ${SOURCE_DIR}/recipes-qt/qt5/qtwebkit_git.bb | ||
| 159 | 162 | ||
| 160 | bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') | 163 | bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') |
| 161 | filename: "{{.BuildDir}}/start-build" | 164 | filename: "{{.BuildDir}}/start-build" |