mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
This commit is contained in:
Liang Qi
@@ -12,17 +12,17 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC
|
||||
qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch
|
||||
qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
|
||||
qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
|
||||
qtci-linux-RHEL-7.6-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
|
||||
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
|
||||
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
|
||||
qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release
|
||||
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release
|
||||
qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests
|
||||
qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck
|
||||
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
|
||||
@@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73
|
||||
qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
|
||||
qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-14 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-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
@@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC
|
||||
qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 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
|
||||
qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
|
||||
@@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73
|
||||
qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
|
||||
qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-14 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-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
@@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC
|
||||
qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-14 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
|
||||
qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
|
||||
@@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder"
|
||||
|
||||
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
|
||||
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
|
||||
SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
|
||||
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
|
||||
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
|
||||
|
||||
|
||||
70
coin/provisioning/common/windows/install-msys2.ps1
Normal file
70
coin/provisioning/common/windows/install-msys2.ps1
Normal file
@@ -0,0 +1,70 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs 7-Zip
|
||||
|
||||
$version = "20181211"
|
||||
$prog = "msys2"
|
||||
if (Is64BitWinHost) {
|
||||
$arch = "x86_64"
|
||||
$sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
|
||||
$folder = "msys64"
|
||||
} else {
|
||||
$arch = "i686"
|
||||
$sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
|
||||
$folder = "msys32"
|
||||
}
|
||||
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
|
||||
|
||||
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
|
||||
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
|
||||
$PackagePath = "C:\Windows\Temp\$package"
|
||||
$TargetLocation = "C:\Utils"
|
||||
|
||||
|
||||
Download $url_official $url_cache $PackagePath
|
||||
Verify-Checksum $PackagePath $sha1
|
||||
Extract-tar_gz $PackagePath $TargetLocation
|
||||
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
|
||||
|
||||
# install perl
|
||||
Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
|
||||
Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
|
||||
|
||||
Write-Host "Cleaning $PackagePath.."
|
||||
Remove-Item -Recurse -Force -Path "$PackagePath"
|
||||
|
||||
Write-Output "7-Zip = $version" >> ~\versions.txt
|
||||
@@ -70,6 +70,7 @@ installPackages+=(speech-dispatcher-devel)
|
||||
installPackages+=(python-devel python-pip)
|
||||
# Python 3 with python-devel, pip and virtualenv
|
||||
installPackages+=(rh-python36)
|
||||
installPackages+=(python36-devel)
|
||||
# WebEngine
|
||||
installPackages+=(bison)
|
||||
installPackages+=(flex)
|
||||
@@ -112,6 +113,8 @@ installPackages+=(xcb-util-renderutil-devel)
|
||||
# ODBC support
|
||||
installPackages+=(unixODBC-devel)
|
||||
installPackages+=(unixODBC)
|
||||
# Vulkan support
|
||||
installPackages+=(vulkan-devel)
|
||||
|
||||
sudo yum -y install "${installPackages[@]}"
|
||||
|
||||
@@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder"
|
||||
|
||||
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
|
||||
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
|
||||
SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
|
||||
SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
|
||||
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-msys2.ps1"
|
||||
Reference in New Issue
Block a user