mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 09:46:08 +08:00
Merge remote-tracking branch 'origin/5.7' into 5.8
This change also includes an update of the CI platform configurations to the values that were previously in the CI source tree for builds of the 5.8 branch. This is done within the same change as the merge to preserve atomicity. Task-number: QTQAINFRA-1074 Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
This commit is contained in:
Simon Hausmann
25
coin/platform_configs/default.txt
Normal file
25
coin/platform_configs/default.txt
Normal file
@@ -0,0 +1,25 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples
|
||||
qtci-windows-10-x86_64 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
|
||||
qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-7-x86 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo
|
||||
qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
|
||||
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
|
||||
qtci-linux-RHEL-6.6-x86_64 GCC Release
|
||||
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
|
||||
qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release
|
||||
qtci-osx-10.9-x86_64 Clang DeveloperBuild Release QtNamespace NoPch
|
||||
qtci-osx-10.9-x86_64 Clang Release NoFramework
|
||||
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
|
||||
qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests
|
||||
qtci-linux-Ubuntu-15.04-x86_64 UbuntuTouch_15_04 armv7 GCC Packaging DisableTests OpenGLES2
|
||||
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck
|
||||
17
coin/platform_configs/qt5.txt
Normal file
17
coin/platform_configs/qt5.txt
Normal file
@@ -0,0 +1,17 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2
|
||||
qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
|
||||
qtci-osx-10.10-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
|
||||
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
|
||||
# target arch is used here only for documentation the value is ignored
|
||||
qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests
|
||||
53
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
Normal file
53
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
Normal file
@@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs CMake 3.6.2
|
||||
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="3.6.2"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-Linux-x86_64"
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
echo "Adding $targetFolder/bin to PATH"
|
||||
echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
|
||||
53
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
Normal file
53
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
Normal file
@@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs CMake 3.6.2
|
||||
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="3.6.2"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-Linux-x86_64"
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
echo "Adding $targetFolder/bin to PATH"
|
||||
echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
|
||||
53
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
Normal file
53
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
Normal file
@@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs CMake 3.6.2
|
||||
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="3.6.2"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-Linux-x86_64"
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
echo "Adding $targetFolder/bin to PATH"
|
||||
echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
|
||||
@@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs CMake 3.6.2
|
||||
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="3.6.2"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-Linux-x86_64"
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
echo "Adding $targetFolder/bin to PATH"
|
||||
echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
|
||||
3
coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
Normal file
3
coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
Normal file
@@ -0,0 +1,3 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
@@ -0,0 +1,3 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
3
coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
Normal file
3
coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
Normal file
@@ -0,0 +1,3 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
3
coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
Normal file
3
coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
Normal file
@@ -0,0 +1,3 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
@@ -0,0 +1,3 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
Reference in New Issue
Block a user