Update submodules on '6.2' in qt/qt5

Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Add a platform config file for Qt Application Manager
2026-08-17 09:54:20 +08:00 · 2021-09-02 12:40:52 +03:00 · 2021-09-02 09:19:01 +02:00 · 2021-08-27 14:42:00 +02:00 · 2021-08-27 08:09:25 +00:00 · 2021-08-26 18:17:13 +00:00
54 changed files with 81 additions and 65 deletions
@@ -132,12 +132,6 @@
 	url = ../qtimageformats.git
 	branch = 6.2
 	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 6.2
-	status = ignore
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
@@ -0,0 +1,12 @@
+Version: 2
+Configurations:
+-
+    Id: "ios-tests-target"
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
@@ -15,7 +15,7 @@ Configurations:
    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -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 -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -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']
 -
@@ -0,0 +1,3 @@
+Version: 2
+Include: [cmake_platforms.yaml]
+Configurations: []
@@ -3,7 +3,8 @@ Include: [
    cmake_platforms.yaml,
    cmake_platforms_static_tests.yaml,
    macos-developer-build-tests.yaml,
-    integrity.yaml
+    integrity.yaml,
+    ios-tests.yaml
 ]
 Configurations:
 -
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
+    macos-developer-build-tests.yaml,
+    cmake_platforms_static_tests.yaml
 ]
 Configurations: []
@@ -0,0 +1,6 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    qt-creator.yaml
+    ]
+Configurations: []
@@ -55,8 +55,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
-sdkApiLevel="android-29"
+sdkBuildToolsVersion="30.0.3"
+sdkApiLevel="android-30"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-29"
-$sdkBuildToolsVersion = "29.0.3"
+$sdkApiLevel = "android-30"
+$sdkBuildToolsVersion = "30.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
@@ -2,8 +2,8 @@

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

-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"
+Download http://master.qt.io/development_releases/prebuilt/ninja/v1.10.2/ninja-win-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-really-x86.zip $zip
+Verify-Checksum $zip "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca"

 Extract-7Zip $zip C:\Utils\Ninja
 Remove "$zip"
@@ -90,8 +90,7 @@ 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.
+installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated

 # Common event loop handling
 installPackages+=(libglib2.0-dev)
@@ -231,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh

 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel
 # qtwebengine
 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 nodejs12 glproto-devel \
         libxshmfence-devel libXdamage-devel

 # qtwebkit
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
@@ -37,10 +37,10 @@ set -ex

 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.4"
+version="12.5.1"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
-url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
+url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
+sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517"

 InstallCommandLineTools $url $url $sha1 $packageName $version

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
Author	SHA1	Message	Date
Qt Submodule Update Bot	3a4502ae3d	Update submodules on '6.2' in qt/qt5 Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-02 12:40:52 +03:00
Robert Griebl	33988e12ac	Add a platform config file for Qt Application Manager Change-Id: I59013a841e96eb679798e906af4c1af09884dc45 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit `2b22f80725`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-09-02 09:19:01 +02:00
Alexandru Croitor	51155b7bf8	Build minimal subset of tests in qtdeclarative desktop static builds Task-number: QTBUG-87580 Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `f0c7664195`) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>	2021-08-27 14:42:00 +02:00
Alexandru Croitor	26e43959e1	iOS: Build a subset of tests when targeting iOS Currently will only build tests/auto/cmake projects in qtbase. More work is needed for the other repos. Task-number: QTBUG-95839 Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `4fea3be3af`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-27 08:09:25 +00:00
Assam Boudjelthia	8ab13223a5	Coin: bump Android build tools and platform sdk level from 29 to 30 Google requires target SDK level 30 for apps that can be accepted to the Play Store. This change goes together with bumping the default target sdk in qtbase (from 29 to 30 as well). Ideally, build tools should be kept up to date as well anyway. Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit `6ac98447b5`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-26 18:17:13 +00:00
Heikki Halmet	86a34fb5d7	Upgrade Xcode and Command line tools to the latest version for Big Sur Latest version is 12.5.1 Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit `f824365cb5`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-24 07:14:39 +00:00
Samuli Piippo	5f7bb79fd9	qdp: remove system dependencies Use more of the same arguments as RHEL-8.2-host to limit the unnecessary dependencies to the system libraries. Task-number: QTBUG-95882 Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>	2021-08-23 13:51:44 +03:00
Qt Submodule Update Bot	69197946f0	Update submodules on '6.2' in qt/qt5 Change-Id: I729fb6acd74ad1d366a12c6919868654d8df7218 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-20 06:26:23 +03:00
Eike Ziller	3c2fca6bb1	COIN: Re-add qtsdk.yaml That is used by our Jenkins setup for packaging. To keep things simple, just include the cmake_platforms and Qt Creator's config. Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059 Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit `bbd31689ec`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-19 12:29:12 +00:00
Qt Submodule Update Bot	bed102a587	Update submodules on '6.2' in qt/qt5 Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-19 09:33:14 +03:00
Allan Sandfeld Jensen	1f452fd479	Update node.js to 12 For Ubuntu it means using an alternative packages, for openSUSE not using an alternative package. Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `c4b8c908b6`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-18 19:19:46 +00:00
Eike Ziller	aaf0fad6b5	Provisioning: Install 32bit version of Ninja on Windows So it also runs on 32bit Windows. Ninja upstream switched their binary builds to 64bit with Ninja 1.7, so we need to provide our own. Amends `e8b0be7711` Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `f945fdc735`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-17 15:59:58 +00:00
Qt Submodule Update Bot	04ad2b6523	Update submodules on '6.2' in qt/qt5 Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-17 17:34:49 +03:00
Qt Submodule Update Bot	2ef340e02d	Update submodules on '6.2' in qt/qt5 Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-17 07:59:27 +03:00
Joerg Bornemann	384bff22f7	Remove qtgraphicaleffects from .gitmodules This repository has been merged into qt5compat. Change the 'recommends' field of qtquickcontrols2 from qtgraphicaleffects to qt5compat. Fixes: QTBUG-95228 Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit `cec25d2ac6`) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2021-08-16 12:47:23 +02:00