mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-20 05:45:59 +08:00
Compare commits
14 Commits
v6.4.0-bet
...
v6.4.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a92f882ec7 | ||
|
|
30dc3e90e2 | ||
|
|
2edf643736 | ||
|
|
a833250d59 | ||
|
|
b12068a544 | ||
|
|
beaa9271a8 | ||
|
|
329f8f19ff | ||
|
|
97b6fc7f0c | ||
|
|
8e8e05883e | ||
|
|
3dea9c6b10 | ||
|
|
95014705b5 | ||
|
|
97709856d1 | ||
|
|
4d6eb0d26d | ||
|
|
529df4c2d9 |
@@ -51,7 +51,7 @@ Configurations:
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
|
||||
-
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
@@ -68,7 +68,7 @@ Configurations:
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
|
||||
]
|
||||
-
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
@@ -103,7 +103,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'Windows11_21H2-MSVC2019-x64-host'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
|
||||
@@ -111,7 +111,7 @@ Configurations:
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
|
||||
]
|
||||
-
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'MSVC2019'
|
||||
Target arch: 'arm64'
|
||||
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
|
||||
@@ -173,7 +173,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'Windows11_21H2-LLVM-x64-host'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'UseConfigure']
|
||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
|
||||
@@ -195,7 +195,7 @@ Configurations:
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
|
||||
]
|
||||
-
|
||||
Template: 'qtci-windows-11_21H2-x86_64-51'
|
||||
Template: 'qtci-windows-11_21H2-x86_64-52'
|
||||
Compiler: 'Mingw'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
|
||||
|
||||
@@ -10,7 +10,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
|
||||
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
|
||||
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
|
||||
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
Windows10_21H2-MSVC2019-x64-host
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10_21H2-x86_64-51'
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
# shellcheck source=./SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
|
||||
version="3.1.10"
|
||||
version="3.1.14"
|
||||
versionNode="v14.18.2"
|
||||
|
||||
mkdir -p /opt
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
# This script will install emscripten needed by WebAssembly
|
||||
|
||||
$version = "3.1.10"
|
||||
$version = "3.1.14"
|
||||
|
||||
# Make sure python is in the path
|
||||
Prepend-Path "C:\Python27"
|
||||
|
||||
76
coin/provisioning/common/windows/share-test-folders.ps1
Normal file
76
coin/provisioning/common/windows/share-test-folders.ps1
Normal file
@@ -0,0 +1,76 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## 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 https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://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 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script creates and shares folders so that we can run I/O tests with
|
||||
# UNC paths, without depending on an SBM server
|
||||
|
||||
$readonly='testshare'
|
||||
$writable='testsharewritable'
|
||||
$readonlypath="${env:SystemDrive}\${readonly}"
|
||||
$writablepath="${env:SystemDrive}\${writable}"
|
||||
|
||||
Write-Host "******************** Creating folders ${readonlpath} and ${writablepath}"
|
||||
|
||||
if ($(Test-Path -Path $readonlypath)) {
|
||||
Remove-SmbShare -Name $readonly -Force
|
||||
Remove-Item -Path $readonlypath -Force -Recurse
|
||||
}
|
||||
if ($(Test-Path -Path $writablepath)) {
|
||||
Remove-SmbShare -Name $writable -Force
|
||||
Remove-Item -Path $writablepath -Force -Recurse
|
||||
}
|
||||
|
||||
New-Item ${readonlypath} -ItemType Directory
|
||||
New-Item "${readonlypath}\tmp" -ItemType Directory
|
||||
New-SmbShare -Name ${readonly} -Path ${readonlypath} -ReadAccess Users
|
||||
# As expected by tst_networkselftest, exactly 34 bytes
|
||||
"This is 34 bytes. Do not change..." `
|
||||
| Out-File -Encoding ascii -FilePath "${readonlypath}\test.pri" -NoNewline
|
||||
New-Item "${readonlypath}\readme.txt" -ItemType File
|
||||
|
||||
New-Item ${writablepath} -ItemType Directory
|
||||
New-SmbShare -Name ${writable} -Path ${writablepath} -ChangeAccess Users
|
||||
|
||||
Write-Host "******************** File system content"
|
||||
dir ${env:SystemDrive}
|
||||
cd "\\${env:COMPUTERNAME}\${readonly}"
|
||||
dir
|
||||
cd "\\${env:COMPUTERNAME}\${writable}"
|
||||
dir
|
||||
Write-Host "******************** Done Content"
|
||||
@@ -5,7 +5,7 @@ set -ex
|
||||
sudo curl http://repo-clones.ci.qt.io:8081/tools/rmt-client-setup --output rmt-client-setup
|
||||
sudo chmod 755 rmt-client-setup
|
||||
sudo SUSEConnect --cleanup
|
||||
sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint C9:4F:0B:81:DE:84:AF:F2:50:3E:89:B9:7F:BC:63:BB:A7:AC:BE:97
|
||||
sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint 80:90:7F:45:C6:DF:45:8A:57:25:1E:17:5E:D7:E3:6E:96:1B:1B:95
|
||||
|
||||
# Activate these modules
|
||||
sudo SUSEConnect -p sle-module-basesystem/15.3/x86_64
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-git.sh"
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -56,4 +56,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -56,4 +56,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: a970d28893...36d0a5b342
Submodule qt5compat updated: 88209f5664...3efacca5ff
Submodule qtactiveqt updated: 7f2831ac14...02b89bd8ed
2
qtbase
2
qtbase
Submodule qtbase updated: a2334fd510...6dd2dbaef6
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 8defc28d1c...40899c4c2c
2
qtcoap
2
qtcoap
Submodule qtcoap updated: a49f02c615...94a370fbe1
Submodule qtconnectivity updated: 3a16e92abf...05307319fe
Submodule qtdatavis3d updated: 3bf8f3c407...8eff8ee36f
Submodule qtdeclarative updated: de7679f38b...0dc6034f91
2
qtdoc
2
qtdoc
Submodule qtdoc updated: b835a8f4a0...fad57d7430
Submodule qthttpserver updated: 945a42eea2...be2c444239
Submodule qtimageformats updated: 1aedb1a8e2...f9604b4876
Submodule qtlanguageserver updated: f445909700...88a9046251
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 51f8e586d0...f1159fb758
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 4c40604e09...23f8673518
Submodule qtmultimedia updated: 009a48eac8...b68add6e20
Submodule qtnetworkauth updated: 26b964603d...1ae59d4311
2
qtopcua
2
qtopcua
Submodule qtopcua updated: bf88611758...a61e84b305
Submodule qtpositioning updated: 6ca6c6af4c...db57f3a02c
2
qtqa
2
qtqa
Submodule qtqa updated: 70e2a9e555...3e7d83821e
Submodule qtquick3d updated: f82cbf85d6...00e29437ed
Submodule qtquick3dphysics updated: b9d5ec9c78...7c582708b5
Submodule qtquicktimeline updated: e2b9167148...3dd8a2931b
Submodule qtremoteobjects updated: 76c54f9918...8071daa3f2
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 5a429abf6e...691942134e
Submodule qtsensors updated: b2b0f35b63...10420e74d6
Submodule qtserialbus updated: de988e91fc...7cab4aa86e
Submodule qtserialport updated: 39b9e3a04f...fff5648662
Submodule qtshadertools updated: 2bd5389736...6145a01427
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 01d8d68a1b...88e6028a22
2
qtsvg
2
qtsvg
Submodule qtsvg updated: f507246f38...fa323f070a
2
qttools
2
qttools
Submodule qttools updated: 4fcb603351...8e316633b6
Submodule qttranslations updated: 2e525a5df3...12fe1657cd
Submodule qtvirtualkeyboard updated: 973811cc3f...783f7a21fb
Submodule qtwayland updated: fb9ad47599...76c2c5f3be
Submodule qtwebchannel updated: 91d2bb8fff...0f72b4299a
Submodule qtwebengine updated: ce2c439fac...a190ba6685
Submodule qtwebsockets updated: 6bf40c2a0e...1b3696be9d
Submodule qtwebview updated: 46c057dddd...1eec5fcb88
Reference in New Issue
Block a user