Update LA 4.4.1

Task-number: QTBUG-101714 Pick-to: dev 6.3 6.2 5.15 Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
Update submodules on '6.3.0 in qt/qt5'
2026-03-18 02:06:20 +08:00 · 2022-04-06 17:42:40 +02:00 · 2022-04-06 15:42:30 +00:00 · 2022-04-06 15:42:18 +00:00 · 2022-03-24 11:40:32 +00:00 · 2022-03-23 06:36:25 +02:00
41 changed files with 89 additions and 88 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,189 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.3
+	branch = 6.3.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.3
+	branch = 6.3.0
 	status = preview
--- a/LICENSE.QT-LICENSE-AGREEMENT
+++ b/LICENSE.QT-LICENSE-AGREEMENT
@@ -1,5 +1,5 @@
 QT LICENSE AGREEMENT
-Agreement version 4.4
+Agreement version 4.4.1
 This Qt License Agreement ("Agreement") is a legal agreement for the licensing
 of Licensed Software (as defined below) between The Qt Company (as defined
@@ -233,7 +233,7 @@ Appendix 9 hereto.
        United States or a legal entity incorporated outside of the United
        States or having its registered office outside of the United States,
        The Qt Company Ltd., a Finnish company with its registered office at
-        Bertel Jungin aukio D3A, 02600 Espoo, Finland.
+        Miestentie 7, 02150 Espoo, Finland.
 "Third-Party Software" shall have the meaning set forth in Section 4.
@@ -1054,8 +1054,8 @@ The Agreement includes following Appendices 1-10, as applicable.
 - Appendix 1: Licensed Software details
 - Appendix 2: Pricing
 - Appendix 3: Add-on Software details (optional)
- Appendix 4: Non-commercial and educational Licenses (optional)
+- Appendix 4: Small business and startup Licenses (optional)
- Appendix 5: Small business and startup Licenses (optional)
+- Appendix 5: Non-commercial and educational Licenses (optional)
 - Appendix 6: License Reporting (optional)
 - Appendix 7: Marketing Rights (optional)
 - Appendix 8: Intentionally left blank (optional)
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -45,7 +45,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
+    Features: ['Sccache', 'AndroidTestRun', 'Insignificant']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -54,11 +54,11 @@ if (Is64BitWinHost) {
 $version = "1.1.1m"
 $ndk_version = "r22b"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip")
+$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
-$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
+$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1 = "860a7e675bf177e1d929d7594ef4efcf07838327"
+$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
 $destination = "C:\Utils\openssl-android-master"
-$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip"
+$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
 # msys unix style paths
 $ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
@@ -70,7 +70,8 @@ if ((Test-Path $prebuilt_url)) {
    Extract-7Zip $prebuilt_zip C:\Utils
    Remove $prebuilt_zip
 } else {
-    Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+    # openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
    Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
    Verify-Checksum $zip $sha1
    Extract-7Zip $zip C:\Utils\tmp
--- 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/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
Author	SHA1	Message	Date
Jani Heikkinen	1734139bf4	Update LA 4.4.1 Task-number: QTBUG-101714 Pick-to: dev 6.3 6.2 5.15 Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>	2022-04-06 17:42:40 +02:00
Qt Submodule Update Bot	7bd9550eb8	Update submodules on '6.3.0 in qt/qt5' Change-Id: I03e07f99a3972d8dbc33772792e4f8503af49ef6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-04-06 15:42:30 +00:00
Antti Kokko	8b9d185ad3	Coin: Remove 'Packaging' feature from target which is 'Insignificant' 'Insignificant' feature should not be used with target that has 'Packaging' feature enabled. Current: 'Packaging, Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure' After this change: 'Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure' Pick-to: 6.3 dev Change-Id: I0662885db80ed9ca93d5c66902029665382a75fa Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2022-04-06 15:42:18 +00:00
Qt Submodule Update Bot	28fa31c441	Update submodules on '6.3.0 in qt/qt5' Change-Id: I546956f2f585861c9cf3f6f317acd0b7f501b8b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-24 11:40:32 +00:00
Heikki Halmet	686481f48c	Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m Used OpenSSL source package 1.1.1m was changed little bit. All ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf file Pick-to: dev 6.3 6.2 Task-number: QTQAINFRA-4864 Task-number: QTBUG-101863 Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>	2022-03-23 06:36:25 +02:00
Jani Heikkinen	4ec029b83f	Adjust submodule branches Change-Id: I8b52e597dd251a76b7b85cd344e6611d47f35d9b	2022-03-21 07:41:44 +02:00