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.9' into 5.10

Browse Source 
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
This commit is contained in:
Liang Qi
2017-11-08 12:31:35 +01:00
parent f1a9b684bf 207494b1d3
commit 90272a84ae
103 changed files with 1164 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows_removethemall.ps1"