Update submodules on 'dev' in qt/qt5

Change-Id: I4f4bf3edf52471d2e424d2191be5e592435e2d6e Reviewed-by: Qt Submodule Update Bot <[email protected]>
CMake: Mirror missing -no-gui Ubuntu config
2026-10-23 23:39:50 +08:00 · 2020-11-13 19:56:01 +02:00 · 2020-11-13 13:07:00 +01:00 · 2020-11-12 18:21:53 +01:00 · 2020-11-12 05:31:01 +02:00 · 2020-11-11 19:55:57 +00:00
25 changed files with 151 additions and 106 deletions
@@ -19,32 +19,6 @@ project(Qt
 enable_testing()

 set(qt_module_prop_prefix "__qt_prop_")
-function(extract_git_submodules out_module_list)
-    set(current_module "")
-    set(module_list "")
-    file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules" lines)
-    foreach(line IN LISTS lines)
-        # Skip empty lines.
-        if(NOT line)
-            continue()
-        endif()
-        string(REGEX REPLACE "^\\[submodule \"([^\"]+)\"\\]$" "\\1" module "${line}")
-        if (NOT module STREQUAL line)
-            set(current_module "${module}")
-            list(APPEND module_list "${module}")
-        else()
-            string(REGEX REPLACE "^\t([^ =]+) *=.*$" "\\1" prop "${line}")
-            if (NOT prop STREQUAL line)
-                string(REGEX REPLACE "^[^=]+= *" "" value "${line}")
-                string(REPLACE " " ";" value "${value}")
-                set("${qt_module_prop_prefix}${current_module}_${prop}" "${value}" PARENT_SCOPE)
-            else()
-                message(FATAL_ERROR "Malformed line ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules: ${line}")
-            endif()
-        endif()
-    endforeach()
-    set(${out_module_list} ${module_list} PARENT_SCOPE)
-endfunction()

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT QT_BUILD_STANDALONE_TESTS)
@@ -54,8 +28,8 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
 endif()

+include("QtTopLevelHelpers")
 include(ECMOptionalAddSubdirectory)
-include(TopologicalSort)

 # Also make sure the CMake config files do not recreate the already-existing targets
 if (NOT QT_BUILD_STANDALONE_TESTS)
@@ -63,44 +37,27 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
 endif()
 set(QT_SUPERBUILD TRUE)

-# Get submodules list
-extract_git_submodules(git_module_list)
-foreach(module IN LISTS git_module_list)
-    # Prepare a list of dependencies to be fed into topological sort
-    set("${qt_module_prop_prefix}${module}_all_dependencies"
-            ${${qt_module_prop_prefix}${module}_depends}
-            ${${qt_module_prop_prefix}${module}_recommends}
-            ${${qt_module_prop_prefix}${module}_serialize}
-    )
-endforeach()
-
-# Sort by dependencies
-topological_sort(git_module_list "${qt_module_prop_prefix}" "_all_dependencies")
-
-# Check for unknown modules
-foreach(module IN LISTS git_module_list)
-    foreach(dep IN LISTS "${qt_module_prop_prefix}${module}_all_dependencies")
-        if (NOT dep IN_LIST git_module_list)
-            message(FATAL_ERROR "Module '${module}' depends on undeclared module '${dep}'")
-        endif()
-    endforeach()
-endforeach()
-
-# qtbase is always needed
-list(REMOVE_ITEM git_module_list qtbase)
-add_subdirectory(qtbase)
-
-if (NOT QT_BUILD_STANDALONE_TESTS)
-    list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
-    list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
+# Get submodule list if not already defined
+if (NOT BUILD_SUBMODULES)
+    qt_internal_find_modules(BUILD_SUBMODULES)
 endif()

-foreach(module IN LISTS git_module_list)
-    ecm_optional_add_subdirectory(${module})
+qt_internal_sort_module_dependencies("${BUILD_SUBMODULES}" BUILD_SUBMODULES)
+
+foreach(module IN LISTS BUILD_SUBMODULES)
+    message(NOTICE "Configuring '${module}'")
+    ecm_optional_add_subdirectory("${module}")
+
+    if(module STREQUAL "qtbase")
+        if (NOT QT_BUILD_STANDALONE_TESTS)
+            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
+            list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
+        endif()
+    endif()
 endforeach()

 # Check for unmet dependencies
-foreach(module IN LISTS git_module_list)
+foreach(module IN LISTS BUILD_SUBMODULES)
    foreach(dep IN LISTS "${qt_module_prop_prefix}${module}_depends")
        if (dep STREQUAL qtbase)
            # Always available skip
@@ -0,0 +1,85 @@
+# Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
+function(qt_internal_find_modules out_module_list)
+    set(module_list "")
+    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
+    foreach(directory IN LISTS directories)
+        if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
+           AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
+            list(APPEND module_list "${directory}")
+        endif()
+    endforeach()
+    message(DEBUG "qt_internal_find_modules: ${module_list}")
+    set(${out_module_list} "${module_list}" PARENT_SCOPE)
+endfunction()
+
+# poor man's yaml parser, populating $out_dependencies with all dependencies
+# in the $depends_file
+function(qt_internal_parse_dependencies depends_file out_dependencies)
+    file(STRINGS "${depends_file}" lines)
+    set(dependencies "")
+    foreach(line IN LISTS lines)
+        if(line STREQUAL "dependencies:")
+            set(found_dependencies 1)
+        elseif(found_dependencies AND line MATCHES "^  (.*):$")
+            set(dependency ${CMAKE_MATCH_1})
+            # dependencies are specified with relative path to this module
+            string(REPLACE "../" "" dependency ${dependency})
+            list(APPEND dependencies ${dependency})
+        endif()
+    endforeach()
+    message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${module_list}")
+    set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
+endfunction()
+
+# Load $module and populate $out_ordered with the submodules based on their dependencies
+# $ordered carries already sorted dependencies; $out_has_dependencies is left empty
+# if there are no dependencies, otherwise set to 1
+# Function calls itself recursively if a dependency is found that is not yet in $ordered.
+function(qt_internal_add_module_dependencies module ordered out_ordered out_has_dependencies)
+    set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
+    if(NOT EXISTS "${depends_file}")
+        set(${out_has_dependencies} "" PARENT_SCOPE)
+        return()
+    endif()
+    set(${out_has_dependencies} "1" PARENT_SCOPE)
+    set(dependencies "")
+    qt_internal_parse_dependencies(${depends_file} dependencies)
+    # module hasn't been seen yet, append it
+    list(FIND ordered "${module}" pindex)
+    if (pindex EQUAL -1)
+        list(LENGTH ordered pindex)
+        list(APPEND ordered ${module})
+    endif()
+    foreach(dependency IN LISTS dependencies)
+        list(FIND ordered "${dependency}" dindex)
+        if (dindex EQUAL -1)
+            # dependency hasnt' been seen yet - load it
+            list(INSERT ordered ${pindex} "${dependency}")
+            qt_internal_add_module_dependencies(${dependency} "${ordered}" ordered has_dependency)
+        elseif(dindex GREATER pindex)
+            # otherwise, make sure it is before module
+            list(REMOVE_AT ordered ${dindex})
+            list(INSERT ordered ${pindex} "${dependency}")
+        endif()
+    endforeach()
+    set(${out_ordered} "${ordered}" PARENT_SCOPE)
+endfunction()
+
+# populates $out_all_ordered with the sequence of the modules that need
+# to be built in order to build $modules
+function(qt_internal_sort_module_dependencies modules out_all_ordered)
+    set(ordered "")
+    foreach(module IN LISTS modules)
+        set(out_ordered "")
+        qt_internal_add_module_dependencies(${module} "${ordered}" out_ordered module_depends)
+        if(NOT module_depends)
+            list(APPEND no_dependencies "${module}")
+        endif()
+        set(ordered "${out_ordered}")
+    endforeach()
+    if (no_dependencies)
+        list(APPEND ordered "${no_dependencies}")
+    endif()
+    message(DEBUG "qt_internal_parse_dependencies sorted ${modules}: ${ordered}")
+    set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
+endfunction()
@@ -9,14 +9,22 @@ Configurations:
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['Sccache']
    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']
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=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', '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']
@@ -24,7 +32,7 @@ Configurations:
    Id: 'Ubuntu-20.04-host'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['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 -DCMAKE_AUTOGEN_VERBOSE=ON -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']
@@ -10,7 +10,7 @@ Configurations:
    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 -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_CMAKE_DIR=/opt/cmake-3.19.0-rc2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -26,7 +26,7 @@ Configurations:
    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 -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_CMAKE_DIR=/opt/cmake-3.19.0-rc2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -42,7 +42,7 @@ Configurations:
    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 -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_CMAKE_DIR=/opt/cmake-3.19.0-rc2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'QT_QUICK_BACKEND=software',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -8,7 +8,7 @@ Configurations:
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'InsignificantTests']
+    Features: ['UseLegacyInstructions']
    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'
@@ -18,7 +18,7 @@ Configurations:
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions', 'InsignificantTests']
+    Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl'
 -
    Template: 'qtci-linux-openSUSE-15.1-x86_64'
@@ -21,8 +21,3 @@ Configurations:
        '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: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl'
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.18"
-version="3.18.3"
+majorminorversion="3.19"
+version="3.19.0-rc2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
-SHA1="6e5bb13e07616e8fa28ec22e8e8dd2396510f10c"
+SHA1="4e6642baae37c1dd5129595d9392685878ef3f6f"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-Linux-x86_64"

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.18"
-version="3.18.3"
+majorminorversion="3.19"
+version="3.19.0-rc2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz"
-SHA1="75a9bd7ec1ec7cbb7b7fb4ecbe4ec26b691c67c9"
+SHA1="e9587b73e3a47a13795959965b3f06568e1f0591"
 appPrefix="cmake-$version-Darwin-x86_64"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
+CommitSHA="2873885d7e840b4e06483f36f170c609eb30527d"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
+SHA1="1fcc4e61b12f11a1421cc8c3f379276d732e62b7"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"

@@ -33,8 +33,8 @@

 . "$PSScriptRoot\helpers.ps1"

-$majorminorversion = "3.18"
-$version = "3.18.3"
+$majorminorversion = "3.19"
+$version = "3.19.0-rc2"

 $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
@@ -44,7 +44,7 @@ Write-Host "Removing old cmake"
 Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue

 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "ab82b5dd945a7f54d4ecb435441bae247c646c26"
+Verify-Checksum $zip "e66e29530adcebfce321855d21a125d324c784d6"

 Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,13 +35,13 @@

 # This script installs Strawberry Perl

-$version = "5.26.0.1"
+$version = "5.32.0.1"
 if (Is64BitWinHost) {
    $arch = "-64bit"
-    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+    $sha1 = "9ec5ebc865da82eacc2d95ff2976492ca69934ab"
 } else {
    $arch = "-32bit"
-    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
+    $sha1 = "6ad89c6358a174c048f113bfd274d2d0378d60aa"
 }
 $installer_name = "strawberry-perl-" + $version + $arch + ".msi"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $installer_name
@@ -2,11 +2,11 @@

 set -ex

-sudo zypper -nq install git gcc7 gcc7-c++ ninja
-sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
-                                     --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
-                                     --slave /usr/bin/cc cc /usr/bin/gcc-7 \
-                                     --slave /usr/bin/c++ c++ /usr/bin/g++-7
+sudo zypper -nq install git gcc9 gcc9-c++ ninja
+sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 1 \
+                                     --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
+                                     --slave /usr/bin/cc cc /usr/bin/gcc-9 \
+                                     --slave /usr/bin/c++ c++ /usr/bin/g++-9

 sudo zypper -nq install bison flex gperf \
        zlib-devel \
Author	SHA1	Message	Date
Qt Submodule Update Bot	027f659e44	Update submodules on 'dev' in qt/qt5 Change-Id: I4f4bf3edf52471d2e424d2191be5e592435e2d6e Reviewed-by: Qt Submodule Update Bot <[email protected]>	2020-11-13 19:56:01 +02:00
Alexandru Croitor	b6fa6cada0	CMake: Mirror missing -no-gui Ubuntu config Amends `57ae486e36` Fixes: QTBUG-88343 Task-number: QTBUG-86053 Change-Id: Icabf4cda23a61845b7f21b4d9f2e70e05ced0256 Reviewed-by: Toni Saario <[email protected]>	2020-11-13 13:07:00 +01:00
Alexandru Croitor	dc84140127	CMake: Update provisioned CMake to version 3.19.0-rc2 We want to be able to build qdoc and lupdate on MSVC with Ninja Multi-Config. Task-number: QTBUG-85411 Task-number: QTBUG-88139 Task-number: QTBUG-87315 Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Kai Koehne <[email protected]>	2020-11-12 18:21:53 +01:00
Qt Submodule Update Bot	4b97dafe86	Update submodules on 'dev' in qt/qt5 Change-Id: I53ce2d70cfe5cd1f07f5d24590cba5f0502844a2 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2020-11-12 05:31:01 +02:00
Tony Sarajärvi	fd4264aa63	Update Strawberry Perl to 5.32.0.1 Change-Id: I79f1f65af473f4925342267ab000d6261d3a7e42 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Ville-Pekka Karhu <[email protected]> Reviewed-by: Heikki Halmet <[email protected]>	2020-11-11 19:55:57 +00:00
Liang Qi	919253da5c	CI: remove InsignificantTests flag for Ubuntu 20.04 hosts Change-Id: I50ee36c93e084d5bd8cf97a29a44c66698cc4f5a Reviewed-by: Alexandru Croitor <[email protected]>	2020-11-11 17:12:48 +01:00
Liang Qi	4cbe441322	Update submodules on 'dev' in qt/qt5 manually Change-Id: I94ee49436645e1831050d80e3ccdf6f4b966bbae Reviewed-by: Liang Qi <[email protected]>	2020-11-11 17:12:46 +01:00
Volker Hilsheimer	da25b7f149	Use dependencies.yaml to order sub modules Don't rely on .gitmodules, instead parse the dependencies.yaml file from every subdirectory with a CMakeLists.txt, and sort all projects based on that data. Projects with no dependencies are added last. This allows us to get rid of the duplication of dependency information in .gitmodules, and makes each module the authoritative source of its own dependencies. Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d Reviewed-by: Alexandru Croitor <[email protected]>	2020-11-11 11:44:25 +01:00
Maurice Kalinowski	9a82a87954	Update MQTT test broker Latest additions of CentOS cause troubles due to - Updated SSL to set up tls servers - Updated Python version, which removed API calls For the latter, we only need to update the broker. TLS test servers are not used in our setup. However, qtmqtt.git requires on further update to load a different configuration. Task-number: QTBUG-88189 Change-Id: I2d6e559a21dff41deca94aeec8c5db6fdf72a0ac Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Karsten Heimrich <[email protected]>	2020-11-11 07:59:22 +01:00
Tony Sarajärvi	64eecbf317	Upgrade GCC from 7 to 9 in openSUSE Task-number: QTQAINFRA-4006 Change-Id: I2cfce8fbae5974474e349342450d91e29314a8f1 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Ville-Pekka Karhu <[email protected]> Reviewed-by: Liang Qi <[email protected]>	2020-11-10 13:15:09 +00:00