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

Conflicts:
	qtxmlpatterns

Change-Id: Ida8491147bce712af45ab55cea7d9bd14ca9b9eb

25 files changed, 1 insertions, 0 deletions

diff --git a/qt.pro b/qt.pro
index 48b29185..f9344690 100644
--- a/qt.pro
+++ b/qt.pro
@@ -3,6 +3,7 @@ cache(, super)
 
 CONFIG += build_pass   # hack to disable the .qmake.super auto-add
 load(qt_build_config)
+CONFIG -= build_pass   # unhack, as it confuses Qt Creator
 
 TEMPLATE      = subdirs
 
diff --git a/qtactiveqt b/qtactiveqt
-Subproject d6d1217473882c82eca37341d837c195e991058
+Subproject b21d397336d52d034ab6db699c26bf3918fe81e
diff --git a/qtandroidextras b/qtandroidextras
-Subproject f4e81f8ca53eae6186dc85b2ac46e45d0c2b2b7
+Subproject 09c0570ce76576074fa0dd98276d959fe028731
diff --git a/qtbase b/qtbase
-Subproject 62feb088a30045e7fbd2a3074c64d18035b84a9
+Subproject 2b0f02aa5cc0f7d1b460d2d324d5d08c6f6d61b
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 44fd56d22ebc8e49f675e3a05721b0465383077
+Subproject 9902dfdbc44934ce2e8072bc237ca8cdbfb3402
diff --git a/qtdeclarative b/qtdeclarative
-Subproject b433c4b5a761cf035ccb0bfc0982e1b80d1c07b
+Subproject 60d66bea87b72e66e7c466e1c27f966762e1fd5
diff --git a/qtdoc b/qtdoc
-Subproject f308fb8a19f2d684cc2e6d06d230184474539ee
+Subproject 19245e88bae96a8f3757c8db8e5f3104eae12db
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject e8c1b8423a0e2b36adcf4e238a2bbcb90c731d3
+Subproject 1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc
diff --git a/qtimageformats b/qtimageformats
-Subproject b742f21e41ee60a4fbb2d0efeed4d518f72590c
+Subproject dde6daeccdf0a3f8d49fe1777b49046576b1221
diff --git a/qtlocation b/qtlocation
-Subproject 959468ed1bcc98d44025c44aefbc564cd758fab
+Subproject 2ba9fd5550eb7766c20b3a61679e88ec4a6c8a5
diff --git a/qtmacextras b/qtmacextras
-Subproject df23cbf333978facc53185bbdf58219c74baf39
+Subproject 39ccd598cd36b01e3b876f55030c639a9bc3968
diff --git a/qtmultimedia b/qtmultimedia
-Subproject d19bede8adf9d9219ade62a873d294b6b5f76fe
+Subproject db7f7cc5654ddec60297259bc9f86f5f777749c
diff --git a/qtquick1 b/qtquick1
-Subproject a4476cc12ee46be6cbb417bda7cf86743aca306
+Subproject 07d8ce32b1112dcb590c793ee51cb713e514011
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 08a32dff66a89fb517e86d3a2232407bd37fb71
+Subproject 1c54d411ad6e98c3779a412750aec8b93d58787
diff --git a/qtscript b/qtscript
-Subproject a2da34be8426b41047f895a3e8463d58baf3b57
+Subproject f89d64ca722acf4a1a38c5e136bb01eff252597
diff --git a/qtsensors b/qtsensors
-Subproject 07d0e9d579842436b38d7684df3d3bcac179d6f
+Subproject 9a8319a39a06d6cf3163978301d650b8f3558c6
diff --git a/qtserialport b/qtserialport
-Subproject 84ec01711a9869da26f04e14fda5a5fc54073e9
+Subproject 336fbee2e34c7eaf48550105d542cad1979c668
diff --git a/qtsvg b/qtsvg
-Subproject 62c8144782b380407c87d0f75a0f7f7df384703
+Subproject ae68091e0d6023410bc657cf54e7fa9b6c8bbcc
diff --git a/qttools b/qttools
-Subproject cc253a0469336d6c36152b8d1d6a29b9fe68032
+Subproject 80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb
diff --git a/qttranslations b/qttranslations
-Subproject f0283f70a343a8d1013fc60902ce1292a4c9c77
+Subproject b26b3e6c713b6f3b6f5b9b6a010763724c69b0e
diff --git a/qtwebkit b/qtwebkit
-Subproject 99113b7cc7877d3ff1a4ed522ae0517edcde081
+Subproject a1b801fc98ccda988df41e08dc70fdbd50ecb51
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 5c814406c67910158bbf725d9a7fcb10fe9f96e
+Subproject cb8ed9694b850a429a93490beaa6462d9f3b8ea
diff --git a/qtwinextras b/qtwinextras
-Subproject 8ddbbfd4c8c5c4bc397a001a713c72d070841a6
+Subproject 8e497a7fc6fc66f480a78dee705ada67c24ac49
diff --git a/qtx11extras b/qtx11extras
-Subproject 9131e081b91b5bbce791d3e328ae46fdb35c565
+Subproject dd7eec92e7a5f4383783cc161f638867572dc20
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 831c6a4ec263b0f3237db488005cdb69989cfa4
+Subproject eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db