Tony Sarajärvi
894c63834b
Fix spelling of ANDROID_SDK_HOME
...
It was incorrectly created at ANDROID_SDK_ROOT,
but Coin doesn't use that env variable. It uses _HOME.
Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-11-07 15:25:04 +00:00
Tony Sarajärvi
baa46f9590
Provisioning: fix .ci.local addresses to .intra.qt.io
...
Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-11-03 07:15:33 +00:00
Tony Sarajärvi
128075f744
Fix typo in echoing version to versions.txt
...
Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249
Reviewed-by: Joni Jäntti <joni.jantti@qt.io >
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io >
2017-10-17 16:57:17 +00:00
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
Tony Sarajärvi
79cc848ab8
Provision Android SDK to macOS 10.12
...
Task-number: QTQAINFRA-1094
Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572
Reviewed-by: Jake Petroules <jake.petroules@qt.io >
2017-04-20 03:29:23 +00:00
