Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1 | Liang Qi | 2017-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | 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 | ||||
* | Rename conan.ps1 and python.ps1 file in configuration dirs too | Konstantin Tokarev | 2016-11-18 | 1 | -0/+1 |
Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> |