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

..

common

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

2017-04-03 12:06:27 +00:00

qtci-linux-openSUSE-42.1-x86_64

Provision: Cmake 3.6.2

2017-01-11 10:05:59 +00:00

qtci-linux-OpenSuSE-13.01-x86_64

Provision OPENSSL env variable for openSUSE 13.1

2016-11-22 14:29:51 +00:00

qtci-linux-RHEL-6.6-x86_64

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

2017-04-03 12:06:27 +00:00

qtci-linux-RHEL-7.2-x86_64

Linux android builds to RHEL 7.2

2017-02-06 12:07:46 +00:00

qtci-linux-Ubuntu-14.04-x86_64

Merge remote-tracking branch 'origin/5.7' into 5.8

2017-01-12 22:19:30 +01:00

qtci-linux-Ubuntu-15.04-x86_64

Suppress shutdown indicator in Ubuntu

2016-12-07 13:48:24 +00:00

qtci-linux-Ubuntu-16.04-x86_64

Install g++-multilib on Ubuntu 16.04 platforms

2017-03-16 06:20:01 +00:00

qtci-macos-10.12-x86_64

Remove command line tools from macOS 10.11 and 10.12

2017-03-15 13:21:40 +00:00

qtci-osx-10.8-x86_64

Remove shutdown "helpers" for macOS

2016-12-21 11:32:28 +00:00

qtci-osx-10.9-x86_64

Remove shutdown "helpers" for macOS

2016-12-21 11:32:28 +00:00

qtci-osx-10.10-x86_64

Bump Android API level to 21

2017-01-31 12:37:11 +00:00

qtci-osx-10.11-x86_64

Remove command line tools from macOS 10.11 and 10.12

2017-03-15 13:21:40 +00:00

qtci-windows-7-x86

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

2017-04-03 12:06:27 +00:00

qtci-windows-8-x86

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

2017-04-03 12:06:27 +00:00

qtci-windows-8-x86_64

Coin provisioning: Use arg instead of autodetecting architecture

2017-03-30 15:14:04 +00:00

qtci-windows-10-x86

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

2017-04-03 12:06:27 +00:00

qtci-windows-10-x86_64

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

2017-04-03 12:06:27 +00:00