lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-26 22:58:17 +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

40
coin/platform_configs/meta-boot2qt.yaml Normal file
View File

@@ -0,0 +1,40 @@
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'Yocto'
Target arch: 'TARGET10'