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

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

Browse Source 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.

Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
This commit is contained in:
Liang Qi
2017-04-01 11:40:15 +02:00
committed by Simon Hausmann
parent 95223c7466 e00cb3ac59
commit 285ee106e7
18 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-windows-10-x86/02-python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\02-python.ps1"
. "$PSScriptRoot\..\common\python.ps1" 32