Compare commits

..

3 Commits

Author SHA1 Message Date
Simo Fält 7a4b0f76be CI: Add qtpip configurations
Change-Id: I417f4cc5dee8435348581ddd6530c39d8e566745
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2026-09-15 11:31:46 +00:00
Marianne Yrjänä 63f4b4a641 Provisioning: Update QNX7.1 SDP package
Previous SDP update missed windows tools which are need by RTA. Windows
tools now added back to package. In addition, kernel and OpenSSL updated
to newer version with bugfixes.

Fixes: QTBUG-149349
Pick-to: 6.8
Change-Id: I65a35e6e8388a8eb7ddfb34f2be66c6817146011
Reviewed-by: Tuomas Vaarala <tuomas.vaarala@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 6683a395e8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 11e893f4f8)
2026-09-15 06:16:34 +00:00
Oliver Wolff 098ec00e62 Windows provisioning: Remove duplicate libusb install scripts
When libusb installation was added for Windows, Linux, and Mac in change
2cee9da977 there already was a libusb
installation script for Windows in Coin. This script duplication has
never been fixed, so we had 2 scripts for a long time.

Pick-to: 6.8
Change-Id: Ic18824faf543a7cae2497b29e4ac8f757ed83af0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dc29c6d134)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit eb3a82b7c6)
2026-09-11 04:21:32 +00:00
7 changed files with 128 additions and 68 deletions
+46 -46
View File
@@ -1,46 +1,46 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.11.3
branch = 6.11
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.11.3
branch = 6.11
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtmultimedia"]
depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d
path = qtmultimedia
url = ../qtmultimedia.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.11.3
branch = 6.11
status = essential
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.11.3
branch = 6.11
status = essential
priority = 30
[submodule "qtdoc"]
@@ -48,7 +48,7 @@
recommends = qtmultimedia qtshadertools qttasktree qtwebengine
path = qtdoc
url = ../qtdoc.git
branch = 6.11.3
branch = 6.11
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -61,7 +61,7 @@
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = 6.11.3
branch = 6.11
status = essential
priority = 50
[submodule "qtlocation"]
@@ -69,82 +69,82 @@
recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = 6.11.3
branch = 6.11
status = preview
[submodule "qtpositioning"]
depends = qtbase
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools qtmultimedia
path = qt3d
url = ../qt3d.git
branch = 6.11.3
branch = 6.11
status = deprecated
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = 6.11.3
branch = 6.11
status = addon
priority = 10
[submodule "qtwebview"]
@@ -152,160 +152,160 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 6.11.3
branch = 6.11
status = deprecated
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 6.11.3
branch = 6.11
status = deprecated
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtspeech"]
depends = qtbase qtmultimedia
recommends = qtdeclarative
path = qtspeech
url = ../qtspeech.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.11.3
branch = 6.11
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
recommends = qtwebsockets
path = qtmqtt
url = ../qtmqtt.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtlanguageserver"]
depends = qtbase
path = qtlanguageserver
url = ../qtlanguageserver.git
branch = 6.11.3
branch = 6.11
status = preview
[submodule "qthttpserver"]
depends = qtbase
recommends = qtwebsockets
path = qthttpserver
url = ../qthttpserver.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics
url = ../qtquick3dphysics.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtgrpc"]
depends = qtbase
recommends = qtdeclarative
path = qtgrpc
url = ../qtgrpc.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d
path = qtquickeffectmaker
url = ../qtquickeffectmaker.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qtgraphs"]
depends = qtbase qtdeclarative qtquick3d
path = qtgraphs
url = ../qtgraphs.git
branch = 6.11.3
branch = 6.11
status = addon
[submodule "qttasktree"]
depends = qtbase
path = qttasktree
url = ../qttasktree.git
branch = 6.11.3
branch = 6.11
status = preview
[submodule "qtopenapi"]
depends = qtbase
recommends = qtdeclarative
path = qtopenapi
url = ../qtopenapi.git
branch = 6.11.3
branch = 6.11
status = preview
[submodule "qtcanvaspainter"]
depends = qtbase qtdeclarative qtshadertools
path = qtcanvaspainter
url = ../qtcanvaspainter.git
branch = 6.11.3
branch = 6.11
status = preview
+77 -11
View File
@@ -1,12 +1,78 @@
Version: 2
Module only: true
Include: [
cmake_platforms.yaml: [
"windows-10_22h2-msvc2019",
"rhel-9.6"
],
macos.yaml: [
"macos-universal-on-arm64"
]
]
Configurations: []
Module only: True
Configurations:
-
Id: 'win-on-x86_64'
Template: 'qtci-windows-11_24H2-x86_64-73'
Compiler: 'MSVC2022'
Target arch: 'x86_64'
Features: ['Packaging', 'UseConfigure', 'DisableTests']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -no-icu -static -release -no-sql-sqlite -openssl-linked -static-runtime'
Environment variables: [
'TARGET_ARCHITECTURE=x86_64',
'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;',
'LLVM_INSTALL_DIR=',
'LLVM_INSTALL_DIR_msvc=',
'QDOC_USE_STATIC_LIBCLANG=',
'VCPKG_HOST_TRIPLET=x64-windows-qt',
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'INCLUDE={{.Env.ZLIB_PATH_AMD64}};{{.Env.XZ}}\src\liblzma\api;{{.Env.BZIP2}};{{.Env.INCLUDE}}',
'LIB={{.Env.ZLIB_PATH_AMD64}};{{.Env.XZ}}\windows\vs2019\ReleaseMT\x64\liblzma;{{.Env.BZIP2}};{{.Env.LIB}}',
'CMAKE_ARGS=-DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded',
'NON_QTBASE_CMAKE_ARGS=-DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_POLICY_VERSION_MINIMUM=3.5',
]
-
Id: 'win-on-arm64'
Template: 'qtci-windows-11_23H2-aarch64-53'
Compiler: 'MSVC2022'
Features: ['Packaging', 'UseConfigure', 'DisableTests']
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_POLICY_VERSION_MINIMUM=3.5',
'VCPKG_HOST_TRIPLET=arm64-windows-qt',
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
]
-
Id: 'linux-on-x86_64'
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
Compiler: 'GCC'
Features: ['Packaging', 'UseConfigure', 'DisableTests']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-feature-gssapi -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -bundled-xcb-xinput -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR=/home/qt/vcpkg-2025.09.17/installed/x64-linux/ -DOPENSSL_USE_STATIC_LIBS=TRUE',
'VCPKG_HOST_TRIPLET=x64-linux-qt',
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5',
]
-
Id: 'linux-on-arm64'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseConfigure', 'InsignificantTests', 'DisableTests']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-feature-gssapi -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -bundled-xcb-xinput -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DOPENSSL_USE_STATIC_LIBS=TRUE',
'NON_QTBASE_CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.STATIC_OPENSSL_HOME}} -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_CRYPTO_LIBRARY=/home/qt/openssl-3.5.4/lib/libcrypto.a -DOPENSSL_SSL_LIBRARY=/home/qt/openssl-3.5.4/lib/libssl.a',
]
-
Id: 'mac-on-arm64'
Template: 'qtci-macos-15-arm-105'
Compiler: 'Clang'
Target arch: 'arm64'
Features: ['Packaging', 'UseConfigure', 'DisableTests']
Configure arguments: '-opensource -confirm-license -static -confirm-license -nomake examples -nomake tests -accessibility -qt-zlib -qt-libpng -no-cups -no-freetype -no-sql-sqlite QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64"'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="arm64"',
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}} -DCMAKE_POLICY_VERSION_MINIMUM=3.5',
]
-
Id: 'mac-on-x86_64'
Template: 'qtci-macos-15-x86_64-103'
Compiler: 'Clang'
Target arch: 'x86_64'
Features: ['Packaging', 'UseConfigure', 'DisableTests']
Configure arguments: '-opensource -confirm-license -static -confirm-license -nomake examples -nomake tests -accessibility -qt-zlib -qt-libpng -no-cups -no-freetype -no-sql-sqlite QMAKE_APPLE_DEVICE_ARCHS="x86_64"'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64"',
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}} -DCMAKE_POLICY_VERSION_MINIMUM=3.5',
]
+2 -2
View File
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
fi
# QNX SDP
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
targetFile="qnx710.tar.xz"
sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
sha1="c37e6f3a49a259d450b601843a9af2818b6feb96"
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo cp "$aarch64le_toolchain" "$targetPath"
+3 -3
View File
@@ -28,10 +28,10 @@ $folderName = "qnx710"
$targetPath = "$targetFolder$folderName"
# QNX SDP
$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20260422.tar.xz"
$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20260828.tar.xz"
$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
$targetFile = "qnx710.tar.xz"
$sha1 = "98b24df7e8c53a104aee76e769011396fa4bdafd"
$sha1 = "c37e6f3a49a259d450b601843a9af2818b6feb96"
DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl
Copy-Item $aarch64le_toolchain $targetPath
@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\libusb.ps1"
@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\libusb.ps1"
@@ -1,4 +0,0 @@
# Copyright (C) 2025 The Qt Company Ltd
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\..\common\windows\libusb.ps1"