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

Merge remote-tracking branch 'origin/5.6' into 5.9

Browse Source 
Conflicts:
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
This commit is contained in:
Simon Hausmann
2017-08-31 09:52:16 +02:00
parent 21ecbe1957 a99d3432f7
commit 6bf5691ca8
26 changed files with 331 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/qtci-windows-10-x86_64/python3.ps1 Normal file
View File

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