diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:10:00 +0200 |
commit | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (patch) | |
tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/provisioning/common/shared/requirements.txt | |
parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
parent | 42366fd7405f778d3b80f9de2f593ff18f52e0f9 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.
Conflicts:
coin/platform_configs/default.yaml
Temporarily remove the -no-opengl build.
coin/platform_configs/meta-boot2qt.yaml
coin/platform_configs/qt5.yaml
Temporarily remove the webassembly build on windows.
coin/platform_configs/qtwebkit.yaml
Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
Diffstat (limited to 'coin/provisioning/common/shared/requirements.txt')
-rw-r--r-- | coin/provisioning/common/shared/requirements.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/shared/requirements.txt b/coin/provisioning/common/shared/requirements.txt index 12380d85..60239142 100644 --- a/coin/provisioning/common/shared/requirements.txt +++ b/coin/provisioning/common/shared/requirements.txt @@ -13,7 +13,7 @@ Jinja2==2.10 MarkupSafe==1.0 path.py==11.0.1 pathtools==0.1.2 -PyYAML==3.13 +PyYAML==5.1 six==1.11.0 typing==3.6.4 watchdog==0.8.3 |