lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-24 21:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
This commit is contained in:
Liang Qi
2017-08-22 08:22:02 +02:00
parent c2493f9d6d 5df417aeb9
commit 74eb853384
76 changed files with 808 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
View File

@@ -45,7 +45,7 @@
set -e
targetFolder="/opt/android"
baseUrl="http://ci-files01-hki.ci.local/input/android"
baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
# SDK
sdkPackage="android-sdk_r24.4.1-linux.tgz"