qt5/coin/provisioning at 738509c242c9cfbcced7e5ef73ec2ba4be22d32c - qt5

lili/qt5

mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00

Files

Liang Qi ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94

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

common

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

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

qtci-linux-openSUSE-42.1-x86_64

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

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

qtci-linux-RHEL-6.6-x86_64

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

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

qtci-linux-RHEL-7.2-x86_64

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