lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,985 Commits 120 Branches 272 Tags
59cd433253aa7c1074dbfbf5e04f984983a727bc
Commit Graph

2 Commits

Author SHA1 Message Date
Simon Hausmann
6bf5691ca8 Merge remote-tracking branch 'origin/5.6' into 5.9 
Conflicts:
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
 2017-08-31 11:25:26 +02:00
Simo Fält
3690fe06a4 Provisioning: Update CMake on osx 10.10 
Pyside requires cmake 3.1.0 or more recent.

Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2017-08-17 19:52:35 +00:00