lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev

Browse Source 
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
This commit is contained in:
Liang Qi
2018-04-10 15:04:06 +02:00
parent 5abe434755 1616d89eea
commit 9b584a8117
11 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -249,8 +249,8 @@
branch = dev
status = essential
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = dev

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 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
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 Release NoFramework DisableTests

2
coin/platform_configs/tqtc-qt-rta.txt
View File

@@ -2,5 +2,5 @@ Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic

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

@@ -95,3 +95,9 @@ echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd $sdkTargetFolder/tools/bin
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
# Purely informative, show the list of avd devices
./avdmanager list avd

2
coin/provisioning/common/linux/qnx_700.sh
View File

@@ -44,7 +44,7 @@ sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
folderName="qnx700"
targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder

1
coin/provisioning/common/windows/msvc_2015_update3_patch.ps1
View File

@@ -47,7 +47,6 @@ if (Test-Path $preparedPackage) {
# The prepared package contains updated packages so that not everything has to be downloaded
Write-Host "Using prepared package"
Copy-Item -Recurse $preparedPackage $packagePath
exit 0
# Remove the whole downloaded folder
$toRemove = $packagePath + "\vs14-kb3165756-update"
$executable = "$toRemove\vs14-kb3165756.exe"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -90,7 +90,6 @@ installPackages+=(libxslt-devel)
# For building Wayland from source
installPackages+=(libffi-devel)
sudo yum -y update
sudo yum -y install "${installPackages[@]}"
# Make python 2.7 and its pip default

1
coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"

1
coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\install-jdk.ps1"

1
coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\jom.ps1"

1
coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\jom.ps1"