Merge branch '5.4' into 5.4.2

Change-Id: I33d967b5f668c672a55ad93ac314340453850521
Merge tag 'v5.4.1' into 5.4
2026-01-01 21:05:41 +08:00 · 2015-05-29 20:12:13 +02:00 · 2015-05-29 15:53:05 +02:00 · 2015-05-29 15:52:28 +02:00 · 2015-05-29 09:18:21 +00:00 · 2015-05-28 11:33:18 +00:00
29 changed files with 61 additions and 61 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -14,7 +14,7 @@
 #
 # ==[ Please wrap at 72 characters ]===================================|
 #
-# Remember to read http://wiki.qt-project.org/Commit_Policy
+# Remember to read http://wiki.qt.io/Commit_Policy
 #
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,12 +56,12 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
@@ -71,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,12 +97,12 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
@@ -111,65 +111,65 @@
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.1
+	branch = 1.1.2
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.4
+	branch = 5.4.2
 	initrepo = true
--- a/8
+++ b/8
@@ -14,7 +14,7 @@ HOW TO BUILD QT5

     For other platform specific requirements,
     please see section "Setting up your machine" on:
-     http://qt-project.org/wiki/Get_The_Source
+     http://wiki.qt.io/Get_The_Source

   Optional requirements
   ---------------------
@@ -119,9 +119,9 @@ HOW TO BUILD QT5

 Building Qt5 from git
 =====================
- See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
+ See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
 for more information.
- See http://qt-project.org/wiki/Qt-5 for the reference platforms.
+ See http://wiki.qt.io/Qt_5 for the reference platforms.


 Documentation
@@ -139,6 +139,6 @@ HOW TO BUILD QT5
 Running "qmake -query" will list the value of QT_INSTALL_DOCS.

 Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
+ or in the following page: http://wiki.qt.io/Qt5DocumentationProject

 Note: Building the documentation is only tested on desktop platforms.
--- a/README.git
+++ b/README.git
@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
 ========

 For a more in-depth description on how to build Qt5 from git,
- please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
+ please see: http://wiki.qt.io/Building_Qt_5_from_Git


 Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
 ================================

 For more information on how to develop and contribute to Qt, please see:
- http://qt-project.org/wiki/Category:Developing_Qt
+ http://wiki.qt.io/Category:Developing_Qt
--- 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
Oswald Buddenhagen	4a5968ce75	Merge branch '5.4' into 5.4.2 Change-Id: I33d967b5f668c672a55ad93ac314340453850521	2015-05-29 20:12:13 +02:00
Oswald Buddenhagen	843a3407f2	Merge tag 'v5.4.1' into 5.4 Qt 5.4.1 Release	2015-05-29 15:53:05 +02:00
Oswald Buddenhagen	5400507252	Merge tag 'v5.4.0' into 5.4 Qt 5.4.0 Release	2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot	210493d641	Updated submodules. Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot	670466b6a3	Updated submodules. Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-28 11:33:18 +00:00
Qt Submodule Update Bot	07856d73e1	Updated submodules. Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot	dfffbfdc26	Updated submodules. Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot	b62714f88c	Updated submodules. Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot	24f1b3219d	Updated submodules. Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot	f7cb995d04	Updated submodules. Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot	11963ba9f0	Updated submodules. Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot	39ce0228da	Updated submodules. Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-28 10:58:28 +00:00
Sergio Ahumada	95bb29e243	Replace old qt-project.org wiki with wiki.qt.io Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot	68b5c48282	Updated submodules. Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-15 09:16:10 +00:00
Oswald Buddenhagen	451f0a193b	Adjust submodule branches Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68	2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot	59e3021a52	Updated submodules. Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-09 09:28:44 +00:00
Qt Submodule Update Bot	e3cd5bb368	Updated submodules. Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-16 19:57:25 +00:00
Qt Submodule Update Bot	0badf61792	Updated submodules. Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot	98737b388b	Updated submodules. Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-13 04:29:58 +00:00
Qt Submodule Update Bot	9fb1a2e12f	Updated submodules. Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot	b71478c424	Updated submodules. Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot	81efb6de3c	Updated submodules. Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot	ef1f126ddc	Updated submodules. Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-01-29 04:28:53 +00:00
Oswald Buddenhagen	c3a6185b7e	Adjust submodule branches Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455	2015-01-08 12:53:09 +01:00
Qt Submodule Update Bot	3439140073	Updated submodules. Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot	1998742cea	Updated submodules. Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot	b1885ea725	Updated submodules. Change-Id: I338ee26271c05b612fc58381270ca471db12aaef Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-11-27 06:41:45 +01:00