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 |
|
Konstantin Tokarev
|
aac3786d67
|
Add cmake location to PATH when provisioning macOS 10.12
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
2017-04-12 08:55:39 +00:00 |
|
Konstantin Tokarev
|
0c7c11ca56
|
Fix AltUrl of cmake for macOS provisioning
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
2017-04-07 22:04:06 +00:00 |
|
Tony Sarajarvi
|
430aa0192d
|
Add cmake.sh to provisioning for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
|
2017-02-15 18:44:03 +00:00 |
|