3 Commits

Author	SHA1	Message	Date
Heikki Halmet	2a28ce864b	Split Common folder based on operating system families ... This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>	2018-01-10 07:58:26 +00:00
Liang Qi	285ee106e7	Merge remote-tracking branch 'origin/5.6' into 5.9 ... 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	2017-04-03 12:06:27 +00:00
Konstantin Tokarev	1bf242603c	Rename conan.ps1 and python.ps1 file in configuration dirs too ... 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>	2016-11-18 22:19:14 +00:00