Remove qtquickcontrols2.yaml from platform_configs

Task-number: QTBUG-95173 Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9b3411da8d) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
CMake: Update provisioned CMake to version 3.21.1
2026-01-05 14:36:59 +08:00 · 2021-08-14 11:59:02 +02:00 · 2021-08-14 09:58:51 +00:00 · 2021-08-13 16:55:47 +00:00 · 2021-08-13 08:26:00 +00:00 · 2021-08-13 10:25:59 +02:00
53 changed files with 111 additions and 106 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtshadertools qtsvg
+	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
 	branch = 6.2
@@ -24,7 +24,7 @@
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquickcontrols2
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
 	branch = 6.2
@@ -52,7 +52,7 @@
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
+	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
 	branch = 6.2
@@ -138,13 +138,6 @@
 	url = ../qtgraphicaleffects.git
 	branch = 6.2
 	status = ignore
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 6.2
-	status = ignore
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
@@ -174,7 +167,7 @@
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
+	recommends = qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = 6.2
@@ -193,13 +186,6 @@
 	url = ../qtwebview.git
 	branch = 6.2
 	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtdeclarative
-	recommends = qtimageformats qtgraphicaleffects
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 6.2
-	status = essential
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -216,7 +202,7 @@
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
 	branch = 6.2
@@ -305,7 +291,7 @@
 	branch = 6.2
 	status = addon
 [submodule "qtopcua"]
-	depends = qtbase qtdeclarative qtquickcontrols2
+	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
 	branch = 6.2
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
+# The real minimum version will be checked by the qtbase project.
+# 3.16 is the absolute minimum though.
+cmake_minimum_required(VERSION 3.16...3.20)
+
+# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
 set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
-
 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})

+# Run platform auto-detection /before/ the first project() call and thus
+# before the toolchain file is loaded.
 include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")

 project(Qt
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -10,7 +10,7 @@ Configurations:
    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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -26,7 +26,7 @@ Configurations:
    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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -42,7 +42,7 @@ Configurations:
    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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
--- a/coin/platform_configs/qtquickcontrols2.yaml
+++ b/coin/platform_configs/qtquickcontrols2.yaml
@@ -1,5 +0,0 @@
-Version: 2
-Include: [
-  cmake_platforms.yaml
-]
-Configurations: []
--- a/coin/platform_configs/tqtc-qmlcachegenplus.yaml
+++ b/coin/platform_configs/tqtc-qmlcachegenplus.yaml
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.19"
-version="3.19.2"
-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="61c79765a5a8a44a6b94d1c87c489500f170c1c9"
+majorminorversion="3.21"
+version="3.21.1"
+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="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
+appPrefix="cmake-$version-linux-x86_64"

 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"

--- a/coin/provisioning/common/macos/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.19"
-version="3.19.2"
+majorminorversion="3.21"
+version="3.21.1"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="753c72931e9c76c969255c197781635e7110e363"
+SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
 appPrefix="cmake-$version-macos-universal"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
--- a/coin/provisioning/common/macos/ninja.sh
+++ b/coin/provisioning/common/macos/ninja.sh
@@ -38,10 +38,10 @@
 # shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"

-version="1.10.1"
+version="1.10.2"
 internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
 externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
-SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
+SHA1="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
 DestDir="/usr/local/bin/"

 InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
--- a/coin/provisioning/common/unix/install-openssl.sh
+++ b/coin/provisioning/common/unix/install-openssl.sh
@@ -50,8 +50,8 @@ sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "$HOME"
-mv "$opensslHome" "$opensslSource"
+mkdir -p "$opensslSource"
+tar -xzf "$targetFile" --strip 1 -C "$opensslSource"
 cd "$opensslSource"
 pwd

@@ -68,11 +68,17 @@ if [[ "$os" == "linux" ]]; then
 elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
    # Below target location has been hard coded into Coin.
    # QTQAINFRA-1195
-    openssl_install_dir=/usr/local/openssl-$version
-    opensslTargetLocation="/usr/local/opt/openssl"
+    echo "prefix=$prefix"
+    if [[ -z "$prefix" ]]; then
+        prefix="/usr/local"
+    fi
+    openssl_install_dir="$prefix/openssl-$version"
+    opensslTargetLocation="$prefix/opt/openssl"

    commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"

+    export MACOSX_DEPLOYMENT_TARGET=10.14
+
    opensslBuild="${opensslHome}-build"
    opensslDestdir="${opensslHome}-destdir"
    mkdir -p $opensslBuild
@@ -80,17 +86,17 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
    if [ "$os" == "macos-universal" ]; then
        archs="x86_64 arm64"
    else
-        archs="x86_64"
+        archs="$(uname -m)"
    fi

    for arch in $archs; do
        cd $opensslBuild
        echo "Configuring OpenSSL for $arch"
-        mkdir $arch && cd $arch
+        mkdir -p $arch && cd $arch
        $opensslSource/Configure --prefix=$openssl_install_dir $commonFlags darwin64-$arch-cc

-        echo "Building OpenSSL for $arch"
-        make --silent >> /tmp/openssl_make.log 2>&1
+        echo "Building OpenSSL for $arch in $PWD"
+        make >> /tmp/openssl_make.log 2>&1

        echo "Installing OpenSSL for $arch"
        if [ "$os" == "macos-universal" ]; then
@@ -99,12 +105,13 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
            destdir=""
        fi
        # shellcheck disable=SC2024
-        sudo make --silent install DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
+        sudo make install_sw install_ssldirs DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
    done

    if [ "$os" == "macos-universal" ]; then
        echo "Making universal OpenSSL package"
        # shellcheck disable=SC2024
+        sudo rm -Rf "$openssl_install_dir"
        sudo ${BASH_SOURCE%/*}/../macos/makeuniversal.sh "$opensslDestdir/x86_64" $opensslDestdir/arm64
    fi

--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -33,21 +33,21 @@

 . "$PSScriptRoot\helpers.ps1"

-$majorminorversion = "3.19"
-$version = "3.19.2"
+$majorminorversion = "3.21"
+$version = "3.21.1"

-$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
-$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
-$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
+$zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
+$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
+$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-windows-i386.zip"

 Write-Host "Removing old cmake"
 Remove "C:\CMake"

 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "5e42a287610a619c3a150376d9aaad31282cdcd4"
+Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"

 Extract-7Zip $zip C:
-$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
+$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"
 Rename-Item $defaultinstallfolder C:\CMake

 Add-Path "C:\CMake\bin"
--- a/coin/provisioning/common/windows/ninja.ps1
+++ b/coin/provisioning/common/windows/ninja.ps1
@@ -1,13 +1,13 @@
 . "$PSScriptRoot\helpers.ps1"

-$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
+$zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"

-Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
-Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
+Download https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-x86.zip $zip
+Verify-Checksum $zip "ccacdf88912e061e0b527f2e3c69ee10544d6f8a"

 Extract-7Zip $zip C:\Utils\Ninja
 Remove "$zip"

 Add-Path "C:\Utils\Ninja"

-Write-Output "Ninja = 1.6.0" >> ~/versions.txt
+Write-Output "Ninja = 1.10.2" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh
@@ -57,3 +57,5 @@ gsettings set org.gnome.desktop.session idle-delay 0
 echo "Setting Wayland enable as false"
 sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf

+# Set system locale
+sudo localectl set-locale LANG=en_US.UTF-8
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -86,6 +86,7 @@ installPackages+=(gperf)
 installPackages+=(alsa-lib-devel)
 installPackages+=(pulseaudio-libs-devel)
 installPackages+=(libXtst-devel)
+installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 # For Android builds
@@ -137,6 +138,8 @@ installPackages+=(gcc-c++)
 installPackages+=(make)
 # Open source VMware Tools
 installPackages+=(open-vm-tools)
+# Install all available locales (COIN-727)
+installPackages+=(langpacks-*)

 sudo yum -y install "${installPackages[@]}"

--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
@@ -80,9 +80,9 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
 sudo zypper -nq install libicu-devel libicu60_2

 # qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-devel \
+sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel
+         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel

 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -86,6 +86,9 @@ installPackages+=(libdbus-1-dev)
 installPackages+=(libudev-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(libfontconfig1-dev)
+installPackages+=(libgbm-dev)
+installPackages+=(libxkbfile-dev)
+installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
 installPackages+=(nodejs)
 # NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
@@ -114,6 +117,10 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(libgstreamer-gl1.0-0)
+installPackages+=(gir1.2-gst-plugins-base-1.0)
+installPackages+=(gir1.2-gst-plugins-bad-1.0)
+
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
 # python3 development package
@@ -129,6 +136,11 @@ installPackages+=(mesa-common-dev)
 installPackages+=(libgl1-mesa-glx)
 installPackages+=(libgl1-mesa-dev)
 installPackages+=(libegl1-mesa-dev)
+installPackages+=(libegl1)
+installPackages+=(libegl-mesa0)
+installPackages+=(libegl-dev)
+installPackages+=(libglvnd-dev)
+installPackages+=(libgles2-mesa-dev)
 installPackages+=(curl)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
@@ -142,7 +154,6 @@ installPackages+=(libxcomposite-dev)
 installPackages+=(libxdamage-dev)
 installPackages+=(libxrandr-dev)
 installPackages+=(libfontconfig1-dev)
-installPackages+=(libxss-dev)
 installPackages+=(libsrtp2-dev)
 installPackages+=(libwebp-dev)
 installPackages+=(libjsoncpp-dev)
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
@@ -35,9 +35,10 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
 sudo zypper -nq install libicu-devel

 # qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-devel \
+sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel
+         mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \
+         libxshmfence-devel libXdamage-devel

 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel
--- 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
--- 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/1
+++ b/1
--- a/1
+++ b/1
--- 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
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Mitch Curtis	76741ceaa5	Remove qtquickcontrols2.yaml from platform_configs Task-number: QTBUG-95173 Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `9b3411da8d`) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>	2021-08-14 11:59:02 +02:00
Alexandru Croitor	92b188ef62	CMake: Update provisioned CMake to version 3.21.1 Task-number: QTBUG-95018 Task-number: QTBUG-95229 Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit `9218d50a6e`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-14 09:58:51 +00:00
Tor Arne Vestbø	3344530eaa	Improve OpenSSL provisioning on macOS - Make the script idempotent - Use local architecture instead of hard-coding x86_64 - Set deployment target to 10.14 - Improve logging by not building with --silent - Don't install manual pages - Allow custom install prefix (for testing) Change-Id: I728a2595987db0568568bbb8ca8117effca73997 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `f8fab3be9b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-13 16:55:47 +00:00
Daniel Smith	aebf8f743a	Update submodules on '6.2' in qt/qt5 Change-Id: I9f2c3a616edae0ed4f033e76a85a00ea7ab7c40f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>	2021-08-13 08:26:00 +00:00
Mitch Curtis	98fddae379	Recommend qtimageformats for qtdeclarative qtquickcontrols2 uses it. Task-number: QTBUG-95173 Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit `204d92c244`) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2021-08-13 10:25:59 +02:00
Mitch Curtis	a3f580b0ab	Remove qtquickcontrols2 submodule It's now a part of qtdeclarative. Fixes: QTBUG-95416 Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `ed7a7e75ff`) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2021-08-13 10:25:58 +02:00
Heikki Halmet	939c7e7f57	Change locale to en_US and install all available language packages These are needed for Android tests Task-number: COIN-727 Change-Id: Id12a75da2b4485ba5d655ceb0b7c7d6426f2b4cd Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `beb8fcca5f`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-12 18:47:27 +00:00
Alexandru Croitor	bdfbd4ff3f	Remove qtgraphicaleffects.yaml from platform_configs Task-number: QTBUG-95757 Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit `1256b4d504`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-12 15:44:50 +00:00
Joerg Bornemann	8e07b4271b	Remove qtquickcontrols from .gitmodules This repository is not available in Qt6. Every repository that recommended qtquickcontrols already recommends qtquickcontrols2. Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit `149cc2ebc0`)	2021-08-10 16:46:31 +02:00
Qt Submodule Update Bot	a0721ffc10	Update submodules on '6.2' in qt/qt5 Change-Id: I0c36c5156827e4751ba4a9ff12c6a16894a8e5f5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-03 13:21:32 +03:00
Qt Submodule Update Bot	fa08d846df	Update submodules on '6.2' in qt/qt5 Change-Id: I54aedf453b786db519e77da9a314545f08a37266 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-29 10:13:35 +03:00
Qt Submodule Update Bot	d1e747e9c2	Update submodules on '6.2' in qt/qt5 Change-Id: I3bbb725876e9f8f5acd9f651a771f28cc55f063b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-28 07:07:03 +03:00
Simo Fält	ad7211e014	Manually update qtwebengine to unlock CI for pyside-setup Change-Id: I95862a0e46f44de94dc3926e805a2bf7df3a6e9a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-07-27 13:53:41 +03:00
Alexandru Croitor	abed2215b2	CMake: Remove CMake minimum version check in top-level project The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `4180e9c511`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-07-27 09:31:19 +00:00
Qt Submodule Update Bot	97baab98fa	Update submodules on '6.2' in qt/qt5 Change-Id: I12fe7bb75d07e89d4c25ac5d366bb011ec76e872 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-25 05:26:56 +03:00
Qt Submodule Update Bot	3875da7f7a	Update submodules on '6.2' in qt/qt5 Change-Id: I3b34c0b29ce2daba3433e5daa9ef3379a4087fa7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-24 18:27:13 +03:00
Alexandru Croitor	200542194a	Provisioning: Install ninja 1.10.2 for Windows and macOS To avoid error 'too many path components' when building Qt on Windows. Task-number: QTBUG-95286 Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `e8b0be7711`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-07-23 16:41:21 +00:00
Qt Submodule Update Bot	3c8e55904b	Update submodules on '6.2' in qt/qt5 Change-Id: I66530634e78280ed50b2036428df0f29176788c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-23 04:35:17 +03:00
Qt Submodule Update Bot	7c6987f5f2	Update submodules on '6.2' in qt/qt5 Change-Id: I1fbf348a2ce336d230c67cc8ed03fae05d725f29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-22 10:57:22 +03:00
Qt Submodule Update Bot	07ba2084de	Update submodules on '6.2' in qt/qt5 Change-Id: I91aab3d9a572326775c0a2c37383d77918984893 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-21 23:25:48 +03:00
Qt Submodule Update Bot	6742cfecb7	Update submodules on '6.2' in qt/qt5 Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-21 04:05:10 +03:00
Qt Submodule Update Bot	8711116396	Update submodules on '6.2' in qt/qt5 Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-20 12:55:19 +03:00
Qt Submodule Update Bot	b3efc246b3	Update submodules on '6.2' in qt/qt5 Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-20 02:41:20 +03:00
Ulf Hermann	d50ea75346	Coin: Add tqtc-qmlcachegenplus configuration file Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `fab470c190`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-07-14 11:09:04 +00:00
Qt Submodule Update Bot	90d85dae7d	Update submodules on '6.2' in qt/qt5 Change-Id: I7e358268f00769e5acd31546a31df315bab4908d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-07-13 16:47:34 +03:00
Alexandru Croitor	d0583b0388	CMake: Update provisioned CMake to version 3.20.5 Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit `d7c2951de0`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-07-09 18:50:43 +00:00
Allan Sandfeld Jensen	c0c484278d	Add qtwebengine dependencies to provisioning Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit `3f551fedd6`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-07-06 10:28:27 +00:00