Merge remote-tracking branch 'gerrit/stable' into release

Conflicts:
	qtwebkit-examples

Change-Id: Ifa8735dd8f7ddf3aa74474c983327b94ea2737c5

27 files changed, 4 insertions, 3 deletions

diff --git a/.commit-template b/.commit-template
index 0aef528f..813ca689 100644
--- a/.commit-template
+++ b/.commit-template
@@ -4,10 +4,10 @@
 # ==[ Details: Describe what changed and explain why it changed ]======|
 
 
-# ==[ Footers: Uncomment and edit where applicable ]===================|
-#
 # Change log entry (see below for instructions).
 #[ChangeLog][][]
+
+# ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
@@ -22,7 +22,8 @@
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
 # add a change log entry. It can be multiple lines long and ends with an
-# empty newline.
+# empty newline. Try to integrate it into the flow of the commit message
+# to avoid redundancy.
 # Use the module name to indicate the area of the change e.g. [QtCore].
 # Optionally specify a class or subtopic [QtNetwork][QSslSocket].
 # Other common tags are: [General], [Important Behavior Changes],
diff --git a/qtactiveqt b/qtactiveqt
-Subproject cd3e1f5dd257fbe1d1b86d4f72eea01293d3104
+Subproject 279fc6ce0d6b56a9336240a549118220c9c9388
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 4c93e932a5111e222ce196ea8a1b215bf8e96e2
+Subproject f4e81f8ca53eae6186dc85b2ac46e45d0c2b2b7
diff --git a/qtbase b/qtbase
-Subproject 313a74cc4a9a5d200b2059d3d8767fe1a274c50
+Subproject eaedc04d90fdfc28cc9de96a32635bf32776908
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 3016e7fb6d5e00616fa75d2d2eeafa266382f95
+Subproject 02a74dcea028f42d481774134a8b5915212e4c1
diff --git a/qtdeclarative b/qtdeclarative
-Subproject f95fdacb3a12e4f0d37d3c32b34326f2bd1536d
+Subproject d580411cab0d0a91c73e111ac2c0c6c8f77118f
diff --git a/qtdoc b/qtdoc
-Subproject e4e366ef8a0df934f5bb445ef5b2f79accaafc2
+Subproject 960f92f8b6e4ee1f5993ebf642d3490aa0a3047
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject c640a496d63036ead177dd006ef56b9b12d962b
+Subproject e8c1b8423a0e2b36adcf4e238a2bbcb90c731d3
diff --git a/qtimageformats b/qtimageformats
-Subproject d507c358b803cd40ec13ed19e00eced80b73257
+Subproject b742f21e41ee60a4fbb2d0efeed4d518f72590c
diff --git a/qtlocation b/qtlocation
-Subproject c4d3b333a1ec0de5ef1389569b9b65467453e38
+Subproject f9f88b44e747db8ad218879fec4dbb1627996ae
diff --git a/qtmacextras b/qtmacextras
-Subproject 77067ca74e07c34c8db49bf2c1fecaf96bbdcc0
+Subproject df23cbf333978facc53185bbdf58219c74baf39
diff --git a/qtmultimedia b/qtmultimedia
-Subproject ea9f9788d502d4a4307a464d87a00be198df09a
+Subproject f74d7393b88b89933b286b61e4e67ef46809448
diff --git a/qtqa b/qtqa
-Subproject 25851ea69e2d1531c7c063cc25cfb0e4c27b799
+Subproject 38a26e6605270e801c2ede6e026f7591cdc3200
diff --git a/qtquick1 b/qtquick1
-Subproject 2866c00375313d1726cc0473b6b7bfc87b984c7
+Subproject a4476cc12ee46be6cbb417bda7cf86743aca306
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 1d684b38a4fb0b8ce33401fa9c8f415eba6097b
+Subproject 08a32dff66a89fb517e86d3a2232407bd37fb71
diff --git a/qtrepotools b/qtrepotools
-Subproject afd55c79c95afd4800fcd999820daca8296b414
+Subproject d8858f6602714824f8e2c2f665ff8c77d290952
diff --git a/qtscript b/qtscript
-Subproject 15bb30b0e90c628cc3812627923d1d459d46150
+Subproject a2da34be8426b41047f895a3e8463d58baf3b57
diff --git a/qtsensors b/qtsensors
-Subproject 8b501195f623fbcf31b591a1414e1726dbb7ce8
+Subproject 07d0e9d579842436b38d7684df3d3bcac179d6f
diff --git a/qtserialport b/qtserialport
-Subproject 97bbe2acd8b4c14315653a3d9dc5757d6518220
+Subproject d5658bd0ced4a1eb0703d3cb1b566025d610fbd
diff --git a/qtsvg b/qtsvg
-Subproject b719b93770393bbf20251e1dffc70498061e612
+Subproject 62c8144782b380407c87d0f75a0f7f7df384703
diff --git a/qttools b/qttools
-Subproject a60aa90f5ca00e32a1271a476f5da650dddebfd
+Subproject 2aba84b72e3ff110209da3ba1bdca07d3d21522
diff --git a/qttranslations b/qttranslations
-Subproject 46718cc2c6933e1bb02033fb96960e753fc6cec
+Subproject f0283f70a343a8d1013fc60902ce1292a4c9c77
diff --git a/qtwebkit b/qtwebkit
-Subproject 4c86230bfe563ef1e3ef493b870203761bc9f32
+Subproject 9b0de4a45f7172710d5722ff302d43efde2c536
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 634cddbfef6a40b991bcdf8e68e5329747f43c5
+Subproject 5c814406c67910158bbf725d9a7fcb10fe9f96e
diff --git a/qtwinextras b/qtwinextras
-Subproject c996740162dd63fa20e549e57c78ca990b2ca1c
+Subproject 8ddbbfd4c8c5c4bc397a001a713c72d070841a6
diff --git a/qtx11extras b/qtx11extras
-Subproject 120c2267e1960c03a22531c2d5bfe1d87d401ad
+Subproject 9131e081b91b5bbce791d3e328ae46fdb35c565
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 97f266a006d82cc8554915cba6bf767b93d71a0
+Subproject 57350510bec47a94e6d9d95af9a792f0a815b83