From 27c10f248765d736bc45fd7d9ff6afd609a804fc Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Thu, 30 Jan 2020 12:10:07 +0200
Subject: 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>
---
 coin/module_config.yaml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'coin')

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:
       RDEPENDS_${PN}-dbg_pn-x11-common = ""
       # to fix apm, fso-apm conflict in shr-image-all
       VIRTUAL-RUNTIME_apm = "fso-apm"
+      # remove qtwebkit-dev
+      USE_RUBY = ""
       # require conf/distro/include/qt5-versions.inc
       # QT5_VERSION = "5.4.0+git%"
       # for qtwebkit etc
@@ -156,6 +158,7 @@ build_instructions:
       # EXCLUDE_FROM_WORLD
       rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb
       rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
+      rm -r ${SOURCE_DIR}/recipes-qt/qt5/qtwebkit_git.bb
 
       bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/')
     filename: "{{.BuildDir}}/start-build"
-- 
cgit v1.2.3