From 0b24bc3851237425f0738df422a20ade09095681 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Jul 2013 19:32:29 +0300 Subject: [PATCH 01/16] Updated submodules. Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 9e64bb70..35e1b7dd 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9e64bb707883e9ec6aa18b95a151520e43803d60 +Subproject commit 35e1b7dd8fef475a6bf7daf4067bae08dd635c11 diff --git a/qtbase b/qtbase index fa06a866..30f19d90 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa06a866b9319678663b901238f4b227a272c3e9 +Subproject commit 30f19d904fb3b93f4bb9a17646748b1fca4f286a diff --git a/qtdeclarative b/qtdeclarative index 7ee4a064..2fac1d95 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7ee4a0643964e6da3bb424e2cd7833dad04dbed8 +Subproject commit 2fac1d95f7094f6ff086e2f8de9c51f6ef1270c4 diff --git a/qtquickcontrols b/qtquickcontrols index ebe882ba..2c4f86fa 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ebe882ba67b0e52e6fd78a3cd599f37588b73514 +Subproject commit 2c4f86faafff1f68783f9c813a551ad7244fdb62 diff --git a/qtscript b/qtscript index cf8f9093..a8e36025 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit cf8f90933d45a6c44997f72c369961e2cab54493 +Subproject commit a8e3602554c3225046a831cad7a727a56501439b diff --git a/qttools b/qttools index f81931ba..4e26c57b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f81931ba5728ea5e564b60c45780a7bac277f3d7 +Subproject commit 4e26c57bd905a9ea44634014cc7f44e79f8d4eba diff --git a/qtxmlpatterns b/qtxmlpatterns index 8f6e3cd8..2d3774e8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8f6e3cd898ebc6f13adea1baa69a3b78fb2a9a97 +Subproject commit 2d3774e819a65616c06d79a20fc6451b4d93ecf0 From 8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Jul 2013 11:32:21 +0300 Subject: [PATCH 02/16] Updated submodules. Change-Id: I0b24bc3851237425f0738df422a20ade09095681 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 30f19d90..e4484bb1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 30f19d904fb3b93f4bb9a17646748b1fca4f286a +Subproject commit e4484bb15b29b01dba07cbc31c150153f537606a diff --git a/qtdeclarative b/qtdeclarative index 2fac1d95..4615ddde 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2fac1d95f7094f6ff086e2f8de9c51f6ef1270c4 +Subproject commit 4615ddde02306f704b5eab11a5f6e2ba73c0d411 diff --git a/qtquick1 b/qtquick1 index a7fa4cd5..84f03775 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a7fa4cd5850a85c6e06b01c5a0a8aace7fc7511e +Subproject commit 84f0377517f7289cea5e33fbd3239a4fabcc258b diff --git a/qtquickcontrols b/qtquickcontrols index 2c4f86fa..d5b522d3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2c4f86faafff1f68783f9c813a551ad7244fdb62 +Subproject commit d5b522d3465daa3c26f936e8f5a13ae8448a0eae diff --git a/qtsensors b/qtsensors index e89291bc..0862901b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e89291bc2d45b970c66b816a4f781925406f0bf5 +Subproject commit 0862901b142f36e91b98dbdcb2c36585020bb33d diff --git a/qttools b/qttools index 4e26c57b..c83365b4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4e26c57bd905a9ea44634014cc7f44e79f8d4eba +Subproject commit c83365b4d2e9fe09fd4bf8f367dbc4b9c8a2c81a From c57a761615178f0337f1609653798e268c1b7df1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Jul 2013 03:32:39 +0300 Subject: [PATCH 03/16] Updated submodules. Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtquick1 | 2 +- qtxmlpatterns | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e4484bb1..5ec344cc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4484bb15b29b01dba07cbc31c150153f537606a +Subproject commit 5ec344cc7796b8708e2ae722f7cd184c56844504 diff --git a/qtdeclarative b/qtdeclarative index 4615ddde..184cf0e8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4615ddde02306f704b5eab11a5f6e2ba73c0d411 +Subproject commit 184cf0e8f86e324016dd9c78a36e333d2d48cb96 diff --git a/qtquick1 b/qtquick1 index 84f03775..86b1cc81 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 84f0377517f7289cea5e33fbd3239a4fabcc258b +Subproject commit 86b1cc8113f7151417206fe0478fbd71336b9c8f diff --git a/qtxmlpatterns b/qtxmlpatterns index 2d3774e8..808c59c0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2d3774e819a65616c06d79a20fc6451b4d93ecf0 +Subproject commit 808c59c00f23109d1887022c2d9a6f4e5ecc72a4 From c3532a18c95b80d06c1e7d7875698ffc8b816140 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Jul 2013 03:32:13 +0300 Subject: [PATCH 04/16] Updated submodules. Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtquick1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 5ec344cc..183cc501 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5ec344cc7796b8708e2ae722f7cd184c56844504 +Subproject commit 183cc501d66336e419740cb176f8a351d3477d02 diff --git a/qtdeclarative b/qtdeclarative index 184cf0e8..16a6cba5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 184cf0e8f86e324016dd9c78a36e333d2d48cb96 +Subproject commit 16a6cba54f979bbcac6c91321c5714f829f7d75e diff --git a/qtquick1 b/qtquick1 index 86b1cc81..1f3d0ae6 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 86b1cc8113f7151417206fe0478fbd71336b9c8f +Subproject commit 1f3d0ae63b2501460fc1c75f22b579b29147a80d From 7b8a659ecc931702210ad0b10afa8b283f758632 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Jul 2013 19:32:14 +0300 Subject: [PATCH 05/16] Updated submodules. Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 35e1b7dd..7371bac9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 35e1b7dd8fef475a6bf7daf4067bae08dd635c11 +Subproject commit 7371bac96ba0962b79b59994e4e9b9adf4ee17e8 diff --git a/qtbase b/qtbase index 183cc501..87db2fde 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 183cc501d66336e419740cb176f8a351d3477d02 +Subproject commit 87db2fdef30643e734501bc725f3b731c1faab7c diff --git a/qtdeclarative b/qtdeclarative index 16a6cba5..a95f2998 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 16a6cba54f979bbcac6c91321c5714f829f7d75e +Subproject commit a95f2998dbd08494bba136a060cc8d454b5f7cc8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3ecb005b..94ba2a25 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3ecb005bc62826db13e1c82e799997e0b4181e75 +Subproject commit 94ba2a255c4ca7f07e024c9dedf5547f371fd3a2 diff --git a/qtmultimedia b/qtmultimedia index e15a2b92..c74b5446 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e15a2b92b6120a119cf218ab0f0630f23bc45ba5 +Subproject commit c74b544610376c753ea0a29ff2465e2bcfe70e1d diff --git a/qtquick1 b/qtquick1 index 1f3d0ae6..cb9d1a61 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 1f3d0ae63b2501460fc1c75f22b579b29147a80d +Subproject commit cb9d1a61b127030562a206c0142d99997eb82c8e diff --git a/qtserialport b/qtserialport index 238309f6..f0679dda 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 238309f65ba8faaa0b88a4f3d06a224fe3652467 +Subproject commit f0679ddad29a036c2b22870c788be2558ad9d05e diff --git a/qttools b/qttools index c83365b4..1d62c270 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c83365b4d2e9fe09fd4bf8f367dbc4b9c8a2c81a +Subproject commit 1d62c270dd4d44e640d2f7646ddc5dbf04e7825d diff --git a/qtwebkit b/qtwebkit index 42a16bcc..c31ff44d 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 42a16bccb1750f0e4094d9d6366200a5deae9184 +Subproject commit c31ff44d3a17fab37754acb2a0a29cd6eba10699 From 6493c3d8137a4659814949f96465d374dbad1781 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 20 Jul 2013 19:32:24 +0300 Subject: [PATCH 06/16] Updated submodules. Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 87db2fde..bd1dc60d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 87db2fdef30643e734501bc725f3b731c1faab7c +Subproject commit bd1dc60d6555a901fb3005273d7a86efe470739a diff --git a/qtdeclarative b/qtdeclarative index a95f2998..00e6e6ce 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a95f2998dbd08494bba136a060cc8d454b5f7cc8 +Subproject commit 00e6e6cedd73685364acaf55180144d1f7d7f71e From 6d1d35416f07bb6dc4e4a43296ff5028e96495a3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 21 Jul 2013 11:32:10 +0300 Subject: [PATCH 07/16] Updated submodules. Change-Id: I6493c3d8137a4659814949f96465d374dbad1781 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index bd1dc60d..b02eb3b4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd1dc60d6555a901fb3005273d7a86efe470739a +Subproject commit b02eb3b436b49054fe972023c220b7760a0f48f5 From 23c300afd1395538d8702d0f188ca7031fbcf9d6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Jul 2013 11:32:23 +0300 Subject: [PATCH 08/16] Updated submodules. Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquick1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index b02eb3b4..54987c6b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b02eb3b436b49054fe972023c220b7760a0f48f5 +Subproject commit 54987c6bf55b159d3ddb79461439700f6e0111f9 diff --git a/qtdeclarative b/qtdeclarative index 00e6e6ce..e443c7ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00e6e6cedd73685364acaf55180144d1f7d7f71e +Subproject commit e443c7ba5552e5c88c331b370cc7a338d8672494 diff --git a/qtqa b/qtqa index c5ba2745..1e9f5606 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c5ba2745d2493f2d8fba8fddea0040ccc2776c1f +Subproject commit 1e9f5606d26a2824b5d764ac31b485153db0ee77 diff --git a/qtquick1 b/qtquick1 index cb9d1a61..e0f7b223 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit cb9d1a61b127030562a206c0142d99997eb82c8e +Subproject commit e0f7b22341339b77aafa9150b0d79e320e9e4180 From 35fe76d9c343f98ec55c7cacd8c402e90d91ef38 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 30 Jul 2013 03:32:24 +0300 Subject: [PATCH 09/16] Updated submodules. Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6 Reviewed-by: Simon Hausmann --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 7371bac9..356b272b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7371bac96ba0962b79b59994e4e9b9adf4ee17e8 +Subproject commit 356b272b7afe4512becadf1bcefbcae9366fb00b diff --git a/qtbase b/qtbase index 54987c6b..6c21f426 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 54987c6bf55b159d3ddb79461439700f6e0111f9 +Subproject commit 6c21f42657b494e24112c90d8b9fff719f1f8791 diff --git a/qtdeclarative b/qtdeclarative index e443c7ba..53371a55 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e443c7ba5552e5c88c331b370cc7a338d8672494 +Subproject commit 53371a557f791edc2d64c7b21cc1a5bab09afe90 diff --git a/qtdoc b/qtdoc index 5de25a10..b5d97149 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5de25a10442824a478a2787d552eb1ed6d504ad2 +Subproject commit b5d97149d358c50d2f97de5305f65fa728c42dfd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 94ba2a25..9e21979e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 94ba2a255c4ca7f07e024c9dedf5547f371fd3a2 +Subproject commit 9e21979e13304b858301a62d227b7a801b949761 diff --git a/qtimageformats b/qtimageformats index a196fc62..d4a0e849 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a196fc62304ae23e68f60ae85a6106692f419f98 +Subproject commit d4a0e849b9f1534520af99093f0dd05254857e77 diff --git a/qtjsbackend b/qtjsbackend index 904d8b88..e89f7981 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit 904d8b8825aa82dbc6b888968f983ba6aa339832 +Subproject commit e89f7981d7d2ab566a82b2e4da5fafcedb03d4d7 diff --git a/qtmultimedia b/qtmultimedia index c74b5446..cd11c240 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c74b544610376c753ea0a29ff2465e2bcfe70e1d +Subproject commit cd11c240a614acd7fe263e86baacf25ce90df699 diff --git a/qtqa b/qtqa index 1e9f5606..c5961f88 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1e9f5606d26a2824b5d764ac31b485153db0ee77 +Subproject commit c5961f88ecedfd9f62bc6394ee3d2d5392023d0f diff --git a/qtquick1 b/qtquick1 index e0f7b223..b6a75d83 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit e0f7b22341339b77aafa9150b0d79e320e9e4180 +Subproject commit b6a75d831009688b24633d1c0591029ff3cd0d74 diff --git a/qtquickcontrols b/qtquickcontrols index d5b522d3..cbf979e2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d5b522d3465daa3c26f936e8f5a13ae8448a0eae +Subproject commit cbf979e2965a80ccef77998ae31b2242e231b64a diff --git a/qtscript b/qtscript index a8e36025..dd92e336 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a8e3602554c3225046a831cad7a727a56501439b +Subproject commit dd92e3363c5bd14191f66499c5206dd18ce07b71 diff --git a/qtsensors b/qtsensors index 0862901b..a477928c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0862901b142f36e91b98dbdcb2c36585020bb33d +Subproject commit a477928c43d7207cbc77a1d233ecb41ef4f5fe51 diff --git a/qtserialport b/qtserialport index f0679dda..0da1b020 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f0679ddad29a036c2b22870c788be2558ad9d05e +Subproject commit 0da1b020e3a1826d81334ee1ccda840b00c7a03f diff --git a/qtsvg b/qtsvg index a29af8f0..74df40dc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa +Subproject commit 74df40dc55a9f21dff726e03d4926ab6a953d002 diff --git a/qttools b/qttools index 1d62c270..441f3d96 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1d62c270dd4d44e640d2f7646ddc5dbf04e7825d +Subproject commit 441f3d964301942e417b238b6e71b2ad13b976f0 diff --git a/qttranslations b/qttranslations index 94ff4dbe..16d5447f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 94ff4dbe6f56360aec737532ec17ab0fdfb7be2b +Subproject commit 16d5447febe09fcb44be6cdb77e03ffb80238bd9 diff --git a/qtwebkit b/qtwebkit index c31ff44d..ed71c0ab 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit c31ff44d3a17fab37754acb2a0a29cd6eba10699 +Subproject commit ed71c0abca765424ed4cf6654f577c454017781c diff --git a/qtwebkit-examples b/qtwebkit-examples index fff4d0a8..796c8eca 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit fff4d0a8fd161edfbef7b933deed8ec46a348bc6 +Subproject commit 796c8eca17debdb6bed819fd8f34ffb88b7233a0 diff --git a/qtx11extras b/qtx11extras index 30fd950a..f0a5def2 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 30fd950a6540cc1a357ebd85919d84fa2651576c +Subproject commit f0a5def2727d30049cbc73425abe55acee3ffa8b diff --git a/qtxmlpatterns b/qtxmlpatterns index 808c59c0..d6b4d9ad 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 808c59c00f23109d1887022c2d9a6f4e5ecc72a4 +Subproject commit d6b4d9ad75b06b16d7555ebeace6f06010379cf5 From 94eef4e5f768debc1cd21765852fce0d33461f36 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 2 Aug 2013 10:35:30 +0200 Subject: [PATCH 10/16] qtwinextras: add qtdeclarative as an optional dependency qtwinextras contains optional QML types, so qtdeclarative must be listed as an optional dependency to avoid build breaks. Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74 Reviewed-by: Oswald Buddenhagen --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index be514090..e4190b19 100644 --- a/qt.pro +++ b/qt.pro @@ -55,13 +55,13 @@ defineTest(addModule) { addModule(qtbase) addModule(qtmacextras, qtbase) -addModule(qtwinextras, qtbase) addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtjsbackend, qtbase) addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) +addModule(qtwinextras, qtbase, qtdeclarative) addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) From a145dba33484409884851db2a0e2a3d4c82f4e91 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 5 Jul 2013 14:55:14 +0200 Subject: [PATCH 11/16] Doc: specified how to install documentation Added command "make install_docs" Task-number: QTBUG-32212 Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803 Reviewed-by: Jerome Pasion Reviewed-by: Martin Smith --- README | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index b21547cd..54f95bcf 100644 --- a/README +++ b/README @@ -127,12 +127,13 @@ HOW TO BUILD QT5 Documentation ============= - After the configure step, building the documentation is possible by running + After configuring and compiling Qt, building the documentation is possible by running "make docs". - Example: - ./configure -prefix $PWD/qtbase -opensource - make docs + After having built the documentation, you need to install it with the following + command: + + make install_docs The documentation is installed in the path set to $QT_INSTALL_DOCS. Running "qmake -query" will list the value of QT_INSTALL_DOCS. From dd9853b3cb6c7f8d1f015b82a06283b3942bf9bf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2013 11:32:54 +0300 Subject: [PATCH 12/16] Updated submodules. Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 6c21f426..4ca4fb93 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6c21f42657b494e24112c90d8b9fff719f1f8791 +Subproject commit 4ca4fb93f666820ab10fc0e17f54b2b777540779 diff --git a/qtdeclarative b/qtdeclarative index 53371a55..503a45b2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 53371a557f791edc2d64c7b21cc1a5bab09afe90 +Subproject commit 503a45b2c1167c47594aab2d1442465aa521cccb diff --git a/qtimageformats b/qtimageformats index d4a0e849..9baeb56c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d4a0e849b9f1534520af99093f0dd05254857e77 +Subproject commit 9baeb56ceac51755e69589536a49c6f4cfefa4b6 diff --git a/qtjsbackend b/qtjsbackend index e89f7981..0a8af38c 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit e89f7981d7d2ab566a82b2e4da5fafcedb03d4d7 +Subproject commit 0a8af38cf0add7592bf8f491e45a5de8b125a190 diff --git a/qtmultimedia b/qtmultimedia index cd11c240..9f484eae 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cd11c240a614acd7fe263e86baacf25ce90df699 +Subproject commit 9f484eae83fd81e12aa4f07398ad13f9d453ba92 diff --git a/qtquick1 b/qtquick1 index b6a75d83..f9df0b99 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit b6a75d831009688b24633d1c0591029ff3cd0d74 +Subproject commit f9df0b99470f905289126f253ede978b611d6333 diff --git a/qtquickcontrols b/qtquickcontrols index cbf979e2..8553e000 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cbf979e2965a80ccef77998ae31b2242e231b64a +Subproject commit 8553e0007b8c1aeebb857b908e974bb512d70fda diff --git a/qtrepotools b/qtrepotools index 871ad351..542e293d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 871ad351a15903f34edca8f814e21ed6d0876ac5 +Subproject commit 542e293d642405d0d29004e25a50229591607b97 diff --git a/qtsensors b/qtsensors index a477928c..4afdb996 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a477928c43d7207cbc77a1d233ecb41ef4f5fe51 +Subproject commit 4afdb9965bf4a12e657be202c46cc19c65c8f49d diff --git a/qtsvg b/qtsvg index 74df40dc..cfd6618b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 74df40dc55a9f21dff726e03d4926ab6a953d002 +Subproject commit cfd6618b3b9526bc82410411249692a32f29ee88 diff --git a/qttools b/qttools index 441f3d96..098ce1a2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 441f3d964301942e417b238b6e71b2ad13b976f0 +Subproject commit 098ce1a269f50bb4d885b2b9a93951d88ff77a23 diff --git a/qtwebkit b/qtwebkit index ed71c0ab..fe109d34 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit ed71c0abca765424ed4cf6654f577c454017781c +Subproject commit fe109d34374117ce5a1b37f56f8f04dbcb7ba65e diff --git a/qtwebkit-examples b/qtwebkit-examples index 796c8eca..b6dd4264 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 796c8eca17debdb6bed819fd8f34ffb88b7233a0 +Subproject commit b6dd4264111eb277a3fed451979a85e99a0778ba From 824cfe84a86995e356e949542b8189b3f67fd1c0 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 14 Aug 2013 08:37:40 +0200 Subject: [PATCH 13/16] Cleanup of init-repository Removes old Nokia URLs and options associated with Nokia infrastructure Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475 Reviewed-by: Sergio Ahumada Reviewed-by: Alex Blasche Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- init-repository | 45 +++------------------------------------------ 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/init-repository b/init-repository index b355ffa3..45de179a 100755 --- a/init-repository +++ b/init-repository @@ -104,8 +104,6 @@ Skip the `git submodule update' command. Set git config to ignore submodules by default when doing operations on the qt5 repo, such as `pull', `fetch', `diff' etc. -This option is default for --nokia-developer. - After using this option, pass `--ignore-submodules=none' to git to override it as needed. @@ -116,26 +114,12 @@ B =over -=item --nokia-developer - -Switch to internal Nokia URLs. - - =item --berlin -Switch to internal Nokia URLs and make use of the Berlin git mirrors. +Switch to internal URLs and make use of the Berlin git mirrors. (Implies `--mirror'). -=item --ssh - -Use the SSH protocol for git operations. This may be useful if the git -protocol is blocked by a firewall. Note that this requires a user account -with an uploaded SSH key on all servers used. (Implies `--nokia-developer'). - -The `--ssh' option does not affect the gerrit remotes. - - =item --http Use the HTTP protocol for git operations. This may be useful if the git @@ -205,8 +189,6 @@ use Pod::Usage qw( pod2usage ); use Cwd qw( getcwd ); my %PROTOCOLS = ( - 'internal' => 'git://scm.dev.nokia.troll.no/' , - 'ssh' => 'git@scm.dev.nokia.troll.no:' , 'http' => 'http://git.gitorious.org/' , ); @@ -317,7 +299,6 @@ sub parse_arguments 'force' => 0 , 'ignore-submodules' => 0 , 'mirror-url' => "", - 'nokia-developer' => 0 , 'protocol' => "", 'update' => 1 , 'webkit' => 1 , @@ -331,7 +312,6 @@ sub parse_arguments 'force' => \$self->{qw{ force }}, 'ignore-submodules' => \$self->{qw{ ignore-submodules }}, 'mirror=s' => \$self->{qw{ mirror-url }}, - 'nokia-developer' => \$self->{qw{ nokia-developer }}, 'quiet' => \$self->{qw{ quiet }}, 'update!' => \$self->{qw{ update }}, 'webkit!' => \$self->{qw{ webkit }}, @@ -339,26 +319,12 @@ sub parse_arguments 'help|?' => sub { pod2usage(1); }, 'http' => sub { $self->{protocol} = 'http'; }, - 'ssh|ssh-protocol' => sub { $self->{protocol} = 'ssh'; }, - 'berlin|berlin-nokia-developer' => sub { - $self->{'nokia-developer'} = 1; - $self->{'protocol'} = 'internal'; + 'berlin' => sub { $self->{'mirror-url'} = $BER_MIRROR_URL_BASE; }, - - 'nokia-developer' => sub { - $self->{'nokia-developer'} = 1; - $self->{'protocol'} = 'internal'; - $self->{'ignore-submodules'} = 1; - }, ) || pod2usage(2); - if ($self->{'nokia-developer'} && $self->{'protocol'} eq 'http') { - print "*** Ignoring use of HTTP protocol, as it's only usable with external server\n"; - $self->{'protocol'} = ''; - } - # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; @@ -457,12 +423,7 @@ sub git_set_submodule_config my $value = $2; if ($protocol) { - # qt-labs projects are still hosted under qt internally. - if ($protocol ne 'http') { - $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,; - } - - # assume all other projects hosted under gitorious publicly. + # rewrite URL to chosen protocol $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,; } From 941dd92e5b16140cc2e6f766130887ad80a160e4 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 14 Aug 2013 08:41:58 +0200 Subject: [PATCH 14/16] Add --oslo option to init-repository Oslo devs can use a local git mirror. Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd Reviewed-by: Sergio Ahumada Reviewed-by: Alex Blasche Reviewed-by: Joerg Bornemann --- init-repository | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/init-repository b/init-repository index 45de179a..9995d877 100755 --- a/init-repository +++ b/init-repository @@ -119,6 +119,11 @@ B Switch to internal URLs and make use of the Berlin git mirrors. (Implies `--mirror'). +=item --oslo + +Switch to internal URLs and make use of the Oslo git mirrors. +(Implies `--mirror'). + =item --http @@ -261,6 +266,9 @@ my $GERRIT_SSH_BASE my $BER_MIRROR_URL_BASE = 'git://hegel/'; +my $OSLO_MIRROR_URL_BASE + = 'git://qilin/'; + sub new { my ($class, @arguments) = @_; @@ -323,6 +331,9 @@ sub parse_arguments 'berlin' => sub { $self->{'mirror-url'} = $BER_MIRROR_URL_BASE; }, + 'oslo' => sub { + $self->{'mirror-url'} = $OSLO_MIRROR_URL_BASE; + }, ) || pod2usage(2); # Replace any double trailing slashes from end of mirror From 33b6b2677ef1ef326e2c1be2e9205c3d7c9766db Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 20 Aug 2013 17:00:20 +0200 Subject: [PATCH 15/16] Add ChangeLog template. Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7 Reviewed-by: Mitch Curtis Reviewed-by: Oswald Buddenhagen Reviewed-by: Richard J. Moore Reviewed-by: Thiago Macieira --- .commit-template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.commit-template b/.commit-template index f7933986..b7c00b82 100644 --- a/.commit-template +++ b/.commit-template @@ -11,8 +11,22 @@ # # Solicit reviewers. They still need to use the Gerrit frontend. #Reviewed-by: - +# +# Change log entry (see below for instructions). +#[ChangeLog][][] +# # ==[ Please wrap at 72 characters ]===================================| # # Remember to read http://wiki.qt-project.org/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, +# add a change log entry. It can be multiple lines long and ends with an +# empty newline. +# 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], +# [Platform Specific Changes][Windows][OS X][Linux/XCB]. +# +# [ChangeLog][module][class/topic] description of the really important +# change that was just made on several lines. From 770893c71b179aa87c1bf2d83318ba62c8c2aa96 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 31 Aug 2013 03:32:18 +0300 Subject: [PATCH 16/16] Updated submodules. Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtxmlpatterns | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 4ca4fb93..99362fb7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4ca4fb93f666820ab10fc0e17f54b2b777540779 +Subproject commit 99362fb7f25a88829c2d824ebfe6da61d4d7b35f diff --git a/qtdeclarative b/qtdeclarative index 503a45b2..0a29a82d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 503a45b2c1167c47594aab2d1442465aa521cccb +Subproject commit 0a29a82dfb04bafc8408e6d1843fde588b3d1b95 diff --git a/qtdoc b/qtdoc index b5d97149..a09b156a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b5d97149d358c50d2f97de5305f65fa728c42dfd +Subproject commit a09b156a356c1932064d2bd74b497552bbb104c9 diff --git a/qtmultimedia b/qtmultimedia index 9f484eae..13a53a50 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9f484eae83fd81e12aa4f07398ad13f9d453ba92 +Subproject commit 13a53a505640aebd2b10c0c52977650c797678ad diff --git a/qtqa b/qtqa index c5961f88..04ac80df 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c5961f88ecedfd9f62bc6394ee3d2d5392023d0f +Subproject commit 04ac80df296160858aef23145a71c74ccdaea9cc diff --git a/qtquickcontrols b/qtquickcontrols index 8553e000..c304d741 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8553e0007b8c1aeebb857b908e974bb512d70fda +Subproject commit c304d741a27b5822a35d1fb83f8f5e65719907ce diff --git a/qtrepotools b/qtrepotools index 542e293d..a5273ab7 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 542e293d642405d0d29004e25a50229591607b97 +Subproject commit a5273ab7d83aed8f8b74d8347631ec9888badef5 diff --git a/qtscript b/qtscript index dd92e336..fcac3316 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit dd92e3363c5bd14191f66499c5206dd18ce07b71 +Subproject commit fcac33167b4194b91d3741c26593338fe5801af4 diff --git a/qtsensors b/qtsensors index 4afdb996..52c831db 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4afdb9965bf4a12e657be202c46cc19c65c8f49d +Subproject commit 52c831db165f5068826dddef4d41427a98a42dfd diff --git a/qtserialport b/qtserialport index 0da1b020..fea1f603 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0da1b020e3a1826d81334ee1ccda840b00c7a03f +Subproject commit fea1f6030287b5499ed6d4922695e1f3b4ebc00a diff --git a/qttools b/qttools index 098ce1a2..48f147c7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 098ce1a269f50bb4d885b2b9a93951d88ff77a23 +Subproject commit 48f147c72c126cd82f4a4c028a8e55b8227db938 diff --git a/qttranslations b/qttranslations index 16d5447f..0aeadcb2 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 16d5447febe09fcb44be6cdb77e03ffb80238bd9 +Subproject commit 0aeadcb2d42e09809efc1833b83de406fcad47be diff --git a/qtwebkit b/qtwebkit index fe109d34..e99cdcf1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit fe109d34374117ce5a1b37f56f8f04dbcb7ba65e +Subproject commit e99cdcf1369fd54ea15079766b8a5b3d589fddc0 diff --git a/qtwebkit-examples b/qtwebkit-examples index b6dd4264..5105e9db 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit b6dd4264111eb277a3fed451979a85e99a0778ba +Subproject commit 5105e9dbc91e5e12ddfc26b53debbe3767e21874 diff --git a/qtxmlpatterns b/qtxmlpatterns index d6b4d9ad..409655f3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit d6b4d9ad75b06b16d7555ebeace6f06010379cf5 +Subproject commit 409655f3451815930b70a71baa175ab9f34467ed