lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 19:46:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.13' into dev

Browse Source 
This reverts commit d494d76c26.

 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
This commit is contained in:
Liang Qi
2019-08-20 14:07:34 +02:00
parent c63dd0ddfd 42366fd740
commit 9a8fb868ec
154 changed files with 4934 additions and 2186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/shared/requirements.txt
View File

@@ -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