Update submodules on '5.9.2' in qt5

Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2026-01-03 13:37:42 +08:00 · 2017-10-03 14:03:55 +00:00 · 2017-10-02 18:13:31 +00:00 · 2017-09-25 17:31:19 +00:00 · 2017-09-20 12:28:58 +02:00 · 2017-09-18 10:32:58 +00:00
45 changed files with 104 additions and 80 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9
+	branch = 5.9.2
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9
+	branch = 5.9.2
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,101 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.9
+	branch = 5.9.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.9
+	branch = 5.9.2
 	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.9
+	branch = 5.9.2
 	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.9
+	branch = 5.9.2
 	status = preview
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7                                            MSVC2015
 qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
--- a/coin/provisioning/common/patch_qnx.ps1
+++ b/coin/provisioning/common/patch_qnx.ps1
@@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
 $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
 $tempDir = "C:\temp\qnx_path"

-Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
 Verify-Checksum $zip $sha1
 Extract-Zip $zip $tempDir
 Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
@@ -60,5 +60,5 @@ function InstallZipPackageFromURL {

 echo "Patching QNX"

-baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
 InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -1,5 +1,18 @@
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
-sudo subscription-manager refresh
 sudo yum install -y python-devel python-virtualenv
+
+# install the EPEL repository which provides python3
+wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+sudo rpm -Uvh epel-release-latest-7.noarch.rpm
+sudo rm -f epel-release-latest-7.noarch.rpm
+
+# install python3
+sudo yum install -y python34-devel
+
+# install pip3
+wget https://bootstrap.pypa.io/get-pip.py
+sudo python3 get-pip.py
+sudo rm -f get-pip.py
+sudo pip3 install virtualenv
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
@@ -82,6 +82,8 @@ try
    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT
+    # python3 development package
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT
 )
 catch || {
    case $ex_code in
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
@@ -0,0 +1,8 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+sudo pkcon -y refresh
+sudo pkcon -y install python-devel python-virtualenv
+
+# install python3
+sudo pkcon -y install python3 python3-pip python3-virtualenv
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh
@@ -0,0 +1 @@
+source "${BASH_SOURCE%/*}/../common/python3.sh"
--- 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	26ba2cdc5d	Update submodules on '5.9.2' in qt5 Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-10-03 14:03:55 +00:00
Qt Submodule Update Bot	b37ff601f5	Update submodules on '5.9.2' in qt5 Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2017-10-02 18:13:31 +00:00
Qt Submodule Update Bot	6d20c60b75	Update submodules on '5.9.2' in qt5 Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-25 17:31:19 +00:00
Oswald Buddenhagen	4cee1be86b	Adjust submodule branches Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753	2017-09-20 12:28:58 +02:00
Qt Submodule Update Bot	6dd41c8406	Update submodules on '5.9' in qt5 Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-18 10:32:58 +00:00
Simon Hausmann	57043fb07b	Clean up QNX patching Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-16 05:35:10 +00:00
Liang Qi	4b0e2f79c1	Update submodules on '5.9' in qt5 Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-13 06:45:03 +00:00
Simon Hausmann	b1c268a8eb	Build examples also on Linux with namespaces With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>	2017-09-12 16:20:51 +00:00
Dominik Holland	528580bbcd	Install python3 on all platforms This forward-ports commit `a99d3432f7` to 5.9, which should have been done in `6bf5691ca8` but accidentally left out. It reuses parts of commit `a5f3f8ed48` that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-09-12 13:59:10 +00:00
Liang Qi	b6e6882bb7	Update submodules on '5.9' in qt5 Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-11 18:46:00 +00:00
				`@@ -0,0 +1 @@`
				`source "${BASH_SOURCE%/*}/../common/python3.sh"`