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

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

Browse Source 
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

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

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
This commit is contained in:
Liang Qi
2017-09-22 21:15:52 +02:00
parent 6c4eb77aa0 e7472f4308
commit 04ccf0e8db
65 changed files with 479 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,13 @@ function InstallAndroidPackage {
sudo rm -fr "$targetFolder"/"$version"
}
sudo mkdir "$targetFolder"
if [ -d "$targetFolder" ]; then
echo "Removing old Android installation"
sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
fi
sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
# Install Android SDK
echo "Installing Android SDK version $sdkPackage..."
InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName