aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-04-251-17/+5
| | | | | | | | | | 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
* Provision Android SDK to macOS 10.12Tony Sarajärvi2017-04-201-0/+128
Task-number: QTQAINFRA-1094 Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572 Reviewed-by: Jake Petroules <jake.petroules@qt.io>