Update submodules on '6.4 in qt/qt5'

Change-Id: I5c32687f9990fcd663b9a7731f28a4af9a3db015 Reviewed-by: Qt Submodule Update Bot <[email protected]>
Revert "Change QNX temporarily insignificant"
2026-09-20 23:57:36 +08:00 · 2022-07-07 05:33:47 +00:00 · 2022-07-05 12:19:15 +00:00 · 2022-07-05 05:02:17 +00:00 · 2022-06-29 01:39:14 +00:00 · 2022-06-28 09:20:52 +00:00
59 changed files with 202 additions and 62 deletions
@@ -98,7 +98,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)

    if(module STREQUAL "qtbase")
        if (NOT QT_BUILD_STANDALONE_TESTS)
-            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
+            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake")
            list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
        endif()
    endif()
@@ -20,9 +20,10 @@ ColumnLimit: 100
 # How much weight do extra characters after the line length limit have.
 # PenaltyExcessCharacter: 4

-# Disable reflow of qdoc comments: indentation rules are different.
-# Translation comments are also excluded.
-CommentPragmas: "^!|^:"
+# Disable reflow of some specific comments
+# qdoc comments: indentation rules are different.
+# Translation comments and SPDX license identifiers are also excluded.
+CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"

 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
@@ -133,6 +133,7 @@ Configurations:
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'
    ]
 -
+    Id: 'ios-universal'
    Template: 'qtci-macos-11-x86_64-104'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
@@ -1,14 +1,16 @@
 Version: 2
 Configurations:
 -
+    Id: 'qemu-armv7-on-ubuntu20.04'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache']
+    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
        "QT_CMAKE_DIR=/opt/cmake-3.21.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
@@ -21,9 +23,10 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'GCC'
    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache']
+    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
        "QT_CMAKE_DIR=/opt/cmake-3.21.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
@@ -36,9 +39,10 @@ Configurations:
    Target arch: 'mips64'
    Compiler: 'GCC'
    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
+    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
        "QT_CMAKE_DIR=/opt/cmake-3.21.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
+    Id: 'qnx-x86_64-on-ubuntu20.04'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QNX_710'
    Target arch: 'x86_64'
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
+    Id: 'sles-15-static'
    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-arm64-on-macos'
    Template: 'qtci-macos-10.14-x86_64'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
    -
+      Id: "integrity-arm64-on-ubuntu20.04"
      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
      Compiler: 'GCC'
      Target os: 'INTEGRITY'
@@ -7,9 +7,10 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
@@ -0,0 +1,14 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'arm64'
+    Compiler: 'MSVC2019'
+    Target compiler: 'QCC'
+    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
+    Features: ['DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
+    ]
@@ -0,0 +1,22 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    "Ubuntu-20.04-host",
+    "Windows10_21H2-MSVC2019-x64-host",
+    "ios-universal"
+  ],
+  macos.yaml: [
+    "macos-12-arm64-tests",
+  ],
+  cmake_platforms_target_android_host_macos.yaml: [
+    "android-arm64-on-macos"
+  ],
+  cmake_platforms_qemu.yaml: [
+    "qemu-armv7-on-ubuntu20.04"
+  ],
+  cmake_platforms_qemu_qnx710.yaml: [
+    "qnx-x86_64-on-ubuntu20.04"
+  ]
+]
+Configurations: []
@@ -4,7 +4,7 @@ Configurations:
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
@@ -18,19 +18,19 @@ Configurations:
 -
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Qt5', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
    Template: 'qtci-macos-10.14-x86_64'
    Compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
@@ -9,7 +9,7 @@ Configurations:
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DFEATURE_cxx20=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
+    Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
    Id: 'Windows10_21H2-Mingw11-x64-host'
    Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -60,9 +60,9 @@ DownloadAndExtract () {
    rm -rf $file
 }

-aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
-armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
-x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
+aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
+armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
+x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
 QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"

 targetFolder="/opt/"
@@ -80,9 +80,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20211207-linux.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="03f87bad1c5522d6aefcc74dd5ccacd43240ded3"
+sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp $aarch64le_toolchain $targetPath
@@ -0,0 +1,92 @@
+#############################################################################
+##
+## Copyright (C) 2021 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 installs QNX 7.
+
+. "$PSScriptRoot\helpers.ps1"
+
+$tempFolder = "c:\Windows\Temp"
+
+function DownloadAndExtract($1, $2, $3, $4, $5) {
+    $url = $1
+    $sha = $2
+    $file = $3
+    $folder = $4
+    $cachedUrl = $5
+
+    Download $url $cachedUrl "$tempFolder\$file"
+    Verify-Checksum "$tempFolder\$file" "$sha"
+    Extract-tar_gz "$tempFolder\$file" $folder
+}
+
+$aarch64le_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-aarch64le.cmake"
+$armv7le_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-armv7le.cmake"
+$x8664_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-x8664.cmake"
+
+$targetFolder = "C:\Utils\"
+$folderName = "qnx710"
+$targetPath = "$targetFolder$folderName"
+
+# QNX SDP
+$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\qnx\qnx710-windows-linux-20220405.tar.xz"
+$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
+$targetFile = "qnx710.tar.xz"
+$sha1 = "134af2e0f75d7b7c516f824fafee265b89e51d48"
+DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl
+
+Copy-Item $aarch64le_toolchain $targetPath
+Copy-Item $armv7le_toolchain $targetPath
+Copy-Item $x8664_toolchain $targetPath
+
+cmd /c "dir $targetPath"
+
+# Verify that we have last files in tars
+if (-not (test-path $targetPath\qnxsdp-env.bat)) {
+    throw "QNX SDP installation failed!"
+}
+if (-not (test-path $targetPath\qnx-toolchain-x8664.cmake)) {
+    throw "QNX toolchain installation failed!"
+}
+
+# Set env variables
+Set-EnvironmentVariable "QNX_710" "$targetPath"
+Set-EnvironmentVariable "QNX_710_CMAKE" "C:/Utils/$folderName"
+
+Write-Output "QNX SDP = 7.1.0" >> ~\versions.txt
+
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\qnx710.ps1"
Author	SHA1	Message	Date
Qt Submodule Update Bot	0940de7755	Update submodules on '6.4 in qt/qt5' Change-Id: I5c32687f9990fcd663b9a7731f28a4af9a3db015 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-07-07 05:33:47 +00:00
Jukka Jokiniva	b035f60066	Revert "Change QNX temporarily insignificant" This reverts commit `60cb5adc2e`. Reason for revert: QNX licenses fixed Change-Id: I50bdff9b416c10d0a9181cded524c37681a8723e Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `9aa0ec5040`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-07-05 12:19:15 +00:00
Jukka Jokiniva	9f38c997dc	Change QNX temporarily insignificant QNX licenses expired. Temporarily remove QNX from blocking CI. Change-Id: I96f9b2d4c07c1921736c929971ec1e716d7d6131 Reviewed-by: Tarja Sundqvist <[email protected]> (cherry picked from commit `60cb5adc2e`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-07-05 05:02:17 +00:00
Qt Submodule Update Bot	0c717c1426	Update submodules on '6.4 in qt/qt5' Change-Id: I6961497b50e5cb5e25fe36a43fbe78abbea0570a Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-06-29 01:39:14 +00:00
Eike Ziller	898d152739	COIN/Qt Creator: Run tests Change-Id: I73247d88fcd5539c2d3748af7619c2223c237d9c Reviewed-by: Antti Kokko <[email protected]> (cherry picked from commit `58ebc95561`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-28 09:20:52 +00:00
Andreas Buhr	7ac98ea0bb	Also let Linux Android developer build use configure Change-Id: I31bfab26a28aa60354608dfe6531d9605f556c33 Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Toni Saario <[email protected]> (cherry picked from commit `65f50d4d22`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-23 05:41:10 +00:00
Qt Submodule Update Bot	aa516e5187	Update submodules on '6.4 in qt/qt5' Change-Id: I0f8529928677e846ca3bea0091b97706c1d095fc Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-06-23 02:28:41 +00:00
Tommi Mänttäri	458bf1b1bd	CI: make Linux host builds to use the common QNX SDP To ensure that both Linux and Windows host builds are equivalent the Linux host builds need to use the common QNX SDP file that support both host environments. Task-number: QTBUG-101292 Change-Id: Iaf3fe0de1bce64918165555bff07f5cb423fef32 Reviewed-by: Samuli Piippo <[email protected]> (cherry picked from commit `e487623c0d`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-22 10:14:56 +00:00
Tommi Mänttäri	2028583940	CI Nightly: add Windows host support for QNX Add required configurations to Nightly run for building Qt SW in Windows host for QNX OS. Task-number: QTBUG-101292 Change-Id: I689abd6596bf1ab1f30ba07c198e12569dbf2164 Reviewed-by: Heikki Halmet <[email protected]> (cherry picked from commit `857ae6e1e1`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-22 10:14:50 +00:00
Joerg Bornemann	71e4b8f2e6	CMake: Take custom libdir into account When configuring with -libdir set to something that is not recognized by CMake's find_package search procedure, top-level builds failed to configure. This was due to a hard-coded lib/cmake directory added to CMAKE_PREFIX_PATH. Fixes: QTBUG-103823 Change-Id: If8b48e35e654089f32cbe4af9936238cd82b3dbb Reviewed-by: Alexandru Croitor <[email protected]> (cherry picked from commit `96be84d703`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-20 18:20:31 +00:00
Kai Köhne	1e198615f6	Make sure clang-format doesn't reformat SPDX-License-Identifier SPDX-License-Identifier needs to stay on one line to be machine readable, even if this goes above the 100 chars limit. Change-Id: I2cc3d556e30e8d169224cc87a97a2042b47e43f7 Reviewed-by: Mårten Nordheim <[email protected]> (cherry picked from commit `6a4dab1134`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-20 09:31:10 +00:00
Qt Submodule Update Bot	f7ce76453b	Update submodules on '6.4 in qt/qt5' Change-Id: I50d83aaf76d3b8f5ef1be622f6bc367f6a61001a Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-06-16 22:51:33 +00:00
Toni Saario	6e5bc38ab1	Precheck: Run only configs used in cmake_platforms.yaml Most of the modules do not have all configurations from different yamls. Using configs from yamls only used in some modules will lead to precheck using configs which are not used on normal integrations. Change-Id: I7712db05eee485692d0363326194f02e21a40b9a Reviewed-by: Alexandru Croitor <[email protected]> (cherry picked from commit `e9b5cfc634`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-16 15:21:32 +00:00
Alexandru Croitor	b7db0810d3	coin: Fix android automotive configuration to use configure The UseConfigure feature was enabled, but the configure arguments were not ported. Amends `5e9653ef97` Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I89607aef275370dc27910a5cd1fec7603a1fd576 Reviewed-by: Alexey Edelev <[email protected]> (cherry picked from commit `6e95fb2f93`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-15 19:06:29 +02:00
Alexandru Croitor	d44de19ead	coin: Use configure for QEMU Boot2Qt configurations Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I9aacf3e6f15fc074b52e85da9e3f671b4f58a135 Reviewed-by: Alexey Edelev <[email protected]> (cherry picked from commit `64cf9a03b7`) Reviewed-by: Jörg Bornemann <[email protected]>	2022-06-15 19:06:29 +02:00
Toni Saario	8fe851289c	Coin: Add precheck yaml Defines configurations that will run on default precheck. Change-Id: Idb7d3981b2679c3714f86a92808e90fe33aaf136 Reviewed-by: Tor Arne Vestbø <[email protected]> (cherry picked from commit `43a461de46`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-06-14 07:33:55 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\qnx710.ps1"`