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

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

Browse Source 
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
This commit is contained in:
Liang Qi
2017-11-08 12:31:35 +01:00
parent f1a9b684bf 207494b1d3
commit 90272a84ae
103 changed files with 1164 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
View File

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

48
coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
View File

@@ -1,48 +0,0 @@
#############################################################################
##
## Copyright (C) 2017 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\..\common\helpers.ps1"
# This script installs MinGW 5.3
$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip
Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a"
Extract-7Zip $zip C:\
Rename-Item -path C:\mingw32 -newName C:\MinGW530
[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine")
echo "MinGW = 5.3.0" >> ~/versions.txt
del $zip

2
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
View File

@@ -37,7 +37,7 @@
$zip = "c:\users\qt\downloads\qnx700.7z"
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
Extract-7Zip $zip C:\

52
coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
View File

@@ -1,52 +0,0 @@
#############################################################################
##
## Copyright (C) 2017 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\..\common\helpers.ps1"
$version = "11_2_2"
$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll"
$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
echo "Take ownership of existing opengl32.dll from SysWOW64"
takeown /f $openglPackage
icacls $openglPackage /grant Administrators:F
echo "Remove existing opengl32.dll from SysWOW64"
Remove-Item -Recurse -Force $openglPackage
echo "Add new opengl32.dll to SysWOW64"
Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage
Verify-Checksum $openglPackage $openglSha1
# Store version information to ~/versions.txt
echo "OpenGL x86 = $version" >> ~/versions.txt

1
coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 Normal file
View File

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