Update submodules on '5.12.2' in qt5

Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2025-12-21 15:38:15 +08:00 · 2019-03-08 04:47:08 +00:00 · 2019-02-28 19:08:08 +00:00 · 2019-02-28 04:08:21 +00:00 · 2019-02-27 19:35:15 +00:00 · 2019-02-23 06:47:32 +00:00
43 changed files with 103 additions and 82 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.12
+	branch = 5.12.2
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,185 +123,185 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.12
+	branch = 5.12.2
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.12
+	branch = 5.12.2
 	status = addon
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1 +0,0 @@
-qt5.txt
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -0,0 +1,22 @@
+Template                    Target OS           Target arch Compiler    Target Compiler Features
+--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73                     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/provisioning/common/unix/install-breakpad.sh
+++ b/coin/provisioning/common/unix/install-breakpad.sh
@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
    )


-SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
+SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"

 echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
 echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
--- a/coin/provisioning/common/windows/install-breakpad.ps1
+++ b/coin/provisioning/common/windows/install-breakpad.ps1
@@ -87,7 +87,7 @@ catch {
    git checkout $linux_syscall_support_commit_sha1
 }

-Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
+Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"

 # Write HEAD commit sha to versions txt, so build can be repeated at later date
 Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
--- 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
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	7100c54887	Update submodules on '5.12.2' in qt5 Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2019-03-08 04:47:08 +00:00
Qt Submodule Update Bot	3a1e557e54	Update submodules on '5.12.2' in qt5 Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-28 19:08:08 +00:00
Antti Kokko	091820f6a1	Remove qt3d-runtime.txt symbolic link from platform configurations Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot	ffe8fd7701	Update submodules on '5.12.2' in qt5 Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-27 19:35:15 +00:00
Qt Submodule Update Bot	becac559b7	Update submodules on '5.12.2' in qt5 Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot	83d5226604	Update submodules on '5.12.2' in qt5 Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-21 19:06:48 +00:00
Juha Karjalainen	9c60d8b190	Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>	2019-02-18 13:17:52 +00:00
Qt Submodule Update Bot	b3b6b100e6	Update submodules on '5.12.2' in qt5 Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-16 06:50:30 +00:00
Kari Oikarinen	d5d380f452	Adjust submodule branches Change-Id: I309db20815d3b383155e6549b649607e956b8d89	2019-02-13 09:25:22 +02:00