Simon Hausmann 070d9333a6 Merge remote-tracking branch 'origin/5.6' into 5.9 ...

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-osx-10.10-x86_64/android.sh
	coin/provisioning/qtci-osx-10.11-x86_64/android.sh

Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d

2017-04-25 12:37:26 +02:00

..

default.txt

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

2017-04-25 12:37:26 +02:00

qt5.txt

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

2017-04-25 12:37:26 +02:00

qtdeclarative.txt

Enable QEMU based ARM testing for qtdeclarative with Boot2Qt

2017-04-05 09:34:04 +00:00