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.12.2' into 5.12

Browse Source 
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
This commit is contained in:
Liang Qi
2019-03-21 14:26:56 +01:00
parent 323dcdb60f 7100c54887
commit 78afd2d4b6
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/platform_configs/qt3d-runtime.txt
View File

@@ -1 +0,0 @@
qt5.txt

22
coin/platform_configs/qt3d-runtime.txt Normal file
View File

@@ -0,0 +1,22 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

2
coin/provisioning/common/unix/install-breakpad.sh
View File

@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
)
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

2
coin/provisioning/common/windows/install-breakpad.ps1
View File

@@ -87,7 +87,7 @@ catch {
git checkout $linux_syscall_support_commit_sha1
}
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
# Write HEAD commit sha to versions txt, so build can be repeated at later date
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt