lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-23 14:51:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
This commit is contained in:
Liang Qi
2018-01-18 23:41:16 +01:00
parent 99595f44f1 2348ead529
commit 57ba8230bd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/default.txt
View File

@@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests

6
coin/provisioning/common/linux/cmake_linux.sh
View File

@@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding $targetFolder/bin to PATH" echo "Adding $targetFolder/bin to PATH"
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc if uname -a |grep -q "Ubuntu"; then
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile
else
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
fi