diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
| commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
| tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /coin | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 39283baa..7af8e30a 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -76,8 +76,8 @@ build_instructions: # EXCLUDE_FROM_WORLD rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb - rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python3-pyqt5_5.15.1.dev2006161728.bb - rm -r ${SOURCE_DIR}/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb + rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb + rm -r ${SOURCE_DIR}/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') filename: "{{.BuildDir}}/start-build" fileMode: 420 |