Simon Hausmann dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10 ...

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec

2017-09-06 10:19:35 +02:00

..

default.txt

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

2017-09-06 10:19:35 +02:00

qt5.txt

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

2017-08-24 09:12:33 +02:00

qtdeclarative.txt

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

2017-09-06 10:19:35 +02:00

qtwebkit.txt

Use 64-bit host for VS2017 builds of QtWebKit

2017-09-05 13:46:17 +00:00