Update submodules on 'dev' in qt/qt5

Change-Id: Idaaed4151eebe32797fbc53ee4a1d230ac893e75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Change sccache provisioning priority
2026-01-29 18:06:48 +08:00 · 2020-11-09 17:31:59 +02:00 · 2020-11-09 17:11:10 +02:00 · 2020-11-09 12:09:58 +02:00 · 2020-11-09 08:08:55 +02:00 · 2020-11-09 04:13:07 +02:00
24 changed files with 77 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,12 @@
-cmake_minimum_required(VERSION 3.15.0)
+set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")

-include(${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/QtAutoDetect.cmake)
+include("${__qt6_qtbase_src_path}/.cmake.conf")
+include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake")
+qt_internal_check_for_suitable_cmake_version()
+qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version)
+cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
+
+include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")

 project(Qt
    VERSION 6.0.0
@@ -42,9 +48,10 @@ endfunction()

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT QT_BUILD_STANDALONE_TESTS)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/extra-cmake-modules/find-modules")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/kwin")
+    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
+    list(APPEND CMAKE_MODULE_PATH
+        "${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
+    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
 endif()

 include(ECMOptionalAddSubdirectory)
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -21,6 +21,27 @@ instructions:
      userMessageOnFailure: >
        Failed to call cmake.

+    - type: Group
+      instructions:
+        - type: ExecuteCommand
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to build sources.
+        - type: ExecuteCommand
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to generate docs.
+        - type: MakeDirectory
+          directory: "{{.BuildDir}}/qtbase/doc/global"
+      enable_if:
+        condition: property
+        property: features
+        contains_value: "Documentation"
+
  Test:
    - type: EnvironmentVariable
      variableName: Dummy
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -10,6 +10,13 @@ Configurations:
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'InsignificantTests']
+    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'InsignificantTests', 'Documentation']
    Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -59,11 +66,13 @@ Configurations:
    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+    ]
 -
    Template: 'qtci-windows-10-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Insignificant', 'Sccache', "DebugAndRelease"]
+    Features: ['InsignificantTests', 'Sccache', "DebugAndRelease"]
    Configure arguments: '-G"Ninja Multi-Config" -DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -73,15 +82,15 @@ Configurations:
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
    Id: 'CentOS-8.1-host'
    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'InsignificantTests']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
@@ -99,5 +108,9 @@ Configurations:
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache']
    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+    Environment variables: [
+        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
+    ]
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -8,8 +8,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'InsignificantTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-
+        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-;DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi',
        "QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
@@ -25,8 +24,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'InsignificantTests']
    Environment variables: [
-
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../../environment-setup-aarch64-poky-linux',
        "QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
@@ -42,7 +40,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'InsignificantTests', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../../environment-setup-mips64r2-poky-linux',
        "QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -10,6 +10,11 @@ Configurations:
    Compiler: 'GCC'
    Features: ['UseLegacyInstructions', 'InsignificantTests']
    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions', 'DisableTests']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl'
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
@@ -34,7 +39,7 @@ Configurations:
 -
    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'InsignificantTests']
+    Features: ['UseLegacyInstructions']
    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -openssl -qt-pcre -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'
 -
    Template: 'qtci-macos-10.14-x86_64'
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -60,9 +60,9 @@ if ( $toolchain -eq "mingw" ) {
 install $sha1 $baseDestination-$archVer

 if ( $setDefault ) {
-    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-$archVer")
 }
-Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")

 if ( $libclang_version -eq "100" ) {
    # This is a hacked static build of libclang which requires special
--- a/coin/provisioning/qtci-windows-10-x86/100-install-sccache.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/100-install-sccache.ps1
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -1,5 +1,3 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019
--- a/coin/provisioning/qtci-windows-10-x86_64/100-install-sccache.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/100-install-sccache.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/100-install-sccache.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/100-install-sccache.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86_64/100-install-sccache.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/100-install-sccache.ps1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	5dc2c5d94f	Update submodules on 'dev' in qt/qt5 Change-Id: Idaaed4151eebe32797fbc53ee4a1d230ac893e75 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-09 17:31:59 +02:00
Toni Saario	54ffdc3f2f	Change sccache provisioning priority With value 100 the sccache would provision between 10 and 20, which might lead to unexpected behavior. Change-Id: I3143d2102ff03c744476910dffdb924ca3164d26 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-11-09 17:11:10 +02:00
Qt Submodule Update Bot	2f3fb49637	Update submodules on 'dev' in qt/qt5 Change-Id: Ic83483978c86b85e7b709b3174598f97a64bf2c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-09 12:09:58 +02:00
Qt Submodule Update Bot	a6c3df1ae8	Update submodules on 'dev' in qt/qt5 Change-Id: Ieff76e7d9c500f37687f83204792c1d8846eef05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-09 08:08:55 +02:00
Qt Submodule Update Bot	63a27753cf	Update submodules on 'dev' in qt/qt5 Change-Id: Iefc90b0d1bedf2d84663203ecd07bde80b4a2df3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-09 04:13:07 +02:00
Kai Koehne	c7e8d91332	Windows: Fix lookup of LLVM_INSTALL_DIR environment variables "_ARCH_" was dynamically replaced by either 32 or 64 in qttools/configure.pri. Anyhow, this is not supported by the CMake build, and not needed, since we only build with 64 toolchains on Windows. the qmake builds can still automatically select the "right" toolchain by either loading LLVM_INSTALL_DIR_msvc, LLVM_INSTALL_DIR_mingw. But for CMake builds we now explicitly set LLVM_INSTALL_DIR in each configuration. Fixes: QTBUG-87215 Change-Id: Iaa7e6eab676c03b34ea723d9f71888ca9ee7bb1f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-11-08 16:57:21 +01:00
Kai Koehne	f19703b0d8	Provisioning: Do not install llvm 32 bit anymore Task-number: QTBUG-87215 Change-Id: Idf0f06fa91e7a9e5e23c1395a90e0733622064d3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-11-08 16:57:18 +01:00
Qt Submodule Update Bot	fa410e3f5a	Update submodules on 'dev' in qt/qt5 Change-Id: Ic4bb0dbbaafc156532d1b05967eb811b9c86fc6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-08 12:46:20 +02:00
Qt Submodule Update Bot	43291fd110	Update submodules on 'dev' in qt/qt5 Change-Id: I4b38af69da0ac6c5880aee6d4940bc3f00d7d62e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-06 19:33:03 +02:00
Alexandru Croitor	992cbdfd01	CMake: Add documentation building CI instructions Replicate the instructions that Coin does for qmake configurations. Build all of qttools and its dependencies and then build the top-level docs. Task-number: QTBUG-87012 Change-Id: Iac70172cf13d8943e60c26a1f2ee3ddf5bae6667 Reviewed-by: Cristian Adam <cristian.adam@qt.io>	2020-11-06 17:26:00 +01:00
Alexandru Croitor	187b80e140	CMake: Mirror missing -no-widgets Ubuntu config Task-number: QTBUG-86053 Change-Id: I791a84b5dc2c159007b2a122ea4c35c97a180c7a Reviewed-by: Cristian Adam <cristian.adam@qt.io>	2020-11-06 17:18:13 +01:00
Alexandru Croitor	cb0a002ba3	CMake: Adjust qemu configs to include qmake specific settings Task-number: QTBUG-86053 Change-Id: Idb43b9c847f42d1a576fea1c3b2775fd4acbde7f Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2020-11-06 17:17:55 +01:00
Alexandru Croitor	605e0b3996	CMake: Enable usage of bundled xinput sources like in qmake configs Task-number: QTBUG-86053 Change-Id: I888b557626146460d1734c04fae8bb819ebf266c Reviewed-by: Simon Hausmann <hausmann@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2020-11-06 17:17:49 +01:00
Alexandru Croitor	28be349bd7	CMake: Bump the minimum required CMake version to 3.18 This is the top-level counterpart change that uses the infra introduced in qtbase. Task-number: QTBUG-88086 Change-Id: I2524cd88da43cffb2b3742caedd1cd2f3130dff5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2020-11-06 17:17:21 +01:00
Alexandru Croitor	7ccc1420f2	CMake: Deduplicate qtbase source path references Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2020-11-06 17:17:21 +01:00
Qt Submodule Update Bot	22d80b5489	Update submodules on 'dev' in qt/qt5 Change-Id: I310004ae9e8895f9f936c13098b1f73bbd17d66a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-06 18:17:21 +02:00
Qt Submodule Update Bot	f5aa1b2957	Update submodules on 'dev' in qt/qt5 Change-Id: If31d3e48baab2785da242b2b3058de7f801f3bdc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-06 02:13:29 +02:00
Edward Welbourne	cd48b6f971	Fix breakage in Coin caused by -verbose going to cmake configure Fixes commit `57ae486e36` Change-Id: I6a20580c27c9474c9507c5f346b78a2a3f793169 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>	2020-11-05 17:07:03 +01:00
Heikki Halmet	013e6972ce	Change Insignificant flag to InsignificantTests for MSVC developer build Builds are passing, but tests still failing Task-number: QTQAINFRA-3949 Change-Id: Ieca2512e06ca09cabf042ee3c966dae65c9e5e86 Reviewed-by: Simo Fält <simo.falt@qt.io>	2020-11-05 18:07:03 +02:00
Tony Sarajärvi	57ae486e36	Bring back the -no-gui build in the CI Task-number: QTQAINFRA-3999 Change-Id: Ifd1c76fc1eadf34a1024e7591f14ab6ab2c4bb56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-11-05 10:29:17 +00:00
Liang Qi	01f0e37b48	CI: remove InsignificantTestsflag for two CentOS 8.1 Task-number: QTQAINFRA-2760 Task-number: QTQAINFRA-3065 Change-Id: Ic221b9c63ddfe5b5f62e3900f11fa0a27371e401 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-11-05 09:48:04 +01:00