From b68c8b9729e2ebd8d2c097d3d36ce6d0e63f787c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 3 Sep 2015 16:59:46 +0200 Subject: [PATCH 1/8] Adjust submodule branches Change-Id: I6e3c7677499747fc10ff1a4e3eaa6e66a409c03e --- .gitmodules | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef08ab13..a223c2b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,85 +97,85 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = 1.2 + branch = 1.2.1 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = 5.5 + branch = 5.5.1 initrepo = true [submodule "qtcanvas3d"] path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.5 + branch = 5.5.1 initrepo = true From ad31b8c5743bd4d9ff00b06466530193dd26853f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 10 Sep 2015 14:33:45 +0300 Subject: [PATCH 2/8] Updated submodules. Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index d906c70d..32d91657 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d906c70d1fdc5d81a05fc40ae106d09109e9579b +Subproject commit 32d9165799a781b697f6fcdf6c22fdefd51afcae diff --git a/qtbase b/qtbase index 7010da2e..1840cc98 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7010da2e6274febf71db40a535ce1d0c4858f143 +Subproject commit 1840cc982a3a8882728b586f8924c74a7b79767f diff --git a/qtcanvas3d b/qtcanvas3d index 8c6d82d4..e372a67c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 8c6d82d4f6783daecf748c26c41f1f57fcdc5a7a +Subproject commit e372a67c1bbdf695f8e550950a3dbf3106389479 diff --git a/qtconnectivity b/qtconnectivity index 7ed64c59..2b2d30a3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7ed64c596c53d6b9081ddd8258adb091b761390f +Subproject commit 2b2d30a31bb43e87b83d88d6541f20ba16ff0308 diff --git a/qtdeclarative b/qtdeclarative index 6067b74b..1ea17d70 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6067b74bb7baadbd28bfdfa8e2d63b775c972b0f +Subproject commit 1ea17d70dcdbece5868a2d35417e0bfc66d68739 diff --git a/qtdoc b/qtdoc index ee02a2d8..60964b2b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ee02a2d816f85d2bf91781e50d3ed1cb54aae3e0 +Subproject commit 60964b2be9b4a021e8b6d5b7e189b0c38e43434b diff --git a/qtqa b/qtqa index 0e8bad86..a7e3433f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0e8bad86ad56324968436032635aa5d3d50411c8 +Subproject commit a7e3433f235658bdb137e1440ea4e46dab50901d diff --git a/qtrepotools b/qtrepotools index 045b138f..94220099 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 045b138f69f49f5b30aadbf74a2d218d315d15c3 +Subproject commit 942200994caec36bfc19d9cac4a792eb4f308ee1 diff --git a/qtserialport b/qtserialport index 3e630840..381e11d2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3e6308409dd679389e6231745e4d919d68d6487c +Subproject commit 381e11d264cbb116d37ee83a4be2ed504bffb717 diff --git a/qttools b/qttools index 1d7b5b2e..39072302 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1d7b5b2e1c798335e20c7fc269e8f8238505eba0 +Subproject commit 3907230229b0f379169fdef38b96265f422d3e71 diff --git a/qtwebengine b/qtwebengine index 60d67ffc..3f9c6206 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 60d67ffcadccdbc074d3d40e93357801e417b444 +Subproject commit 3f9c6206450b0c67a5dadfe0da023ec6be7d1743 diff --git a/qtwebkit b/qtwebkit index 4a631c3a..0d592678 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 4a631c3a6e52ae53a2bad45e185cd51927d94bff +Subproject commit 0d592678bad23a77f35c109253a0263664e69812 diff --git a/qtwinextras b/qtwinextras index 8fe12368..92359d2d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8fe1236810ce0e36e1ac888b37883a1149512228 +Subproject commit 92359d2d571f3b553ab915901c62549df5b2512c From e4b9dc169153021a9204b6fdf3af9f58228fdf3e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 Sep 2015 13:51:52 +0300 Subject: [PATCH 3/8] Updated submodules. Change-Id: Iad31b8c5743bd4d9ff00b06466530193dd26853f Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtbase b/qtbase index 1840cc98..07d4113f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1840cc982a3a8882728b586f8924c74a7b79767f +Subproject commit 07d4113f8f94bddf12437ac3205dce1b6d8fab7d diff --git a/qtconnectivity b/qtconnectivity index 2b2d30a3..b31cbd7c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2b2d30a31bb43e87b83d88d6541f20ba16ff0308 +Subproject commit b31cbd7c5d6b16a20035ace6675835356b69fd65 diff --git a/qtdeclarative b/qtdeclarative index 1ea17d70..219c80b3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1ea17d70dcdbece5868a2d35417e0bfc66d68739 +Subproject commit 219c80b3297ba5f5851152d2414d64b3b4e49676 diff --git a/qtdoc b/qtdoc index 60964b2b..03117638 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 60964b2be9b4a021e8b6d5b7e189b0c38e43434b +Subproject commit 03117638dd782e4c4dc7be63b2aa82d12970ac04 diff --git a/qtimageformats b/qtimageformats index 5598cebd..3c68f26c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5598cebd35157890af20fa824fc9f1c92340270c +Subproject commit 3c68f26c052b06da9b43bb775cbe5a539fccb0c3 diff --git a/qtmultimedia b/qtmultimedia index edc415be..c595fc74 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit edc415be476c7ef59f00914b2a6dfc6896d7a34d +Subproject commit c595fc74abfbf614429952c33f1e746d50f84547 diff --git a/qtqa b/qtqa index a7e3433f..5cb6ae7e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a7e3433f235658bdb137e1440ea4e46dab50901d +Subproject commit 5cb6ae7e79059a8350b74771f656a0a6c408fc1f diff --git a/qtquick1 b/qtquick1 index 9a380765..f079636a 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 9a3807656e2d917acf271bb16f4e296136e52d1d +Subproject commit f079636a3ee5538eb79fd4e7e6ffcb0465a015a0 diff --git a/qtquickcontrols b/qtquickcontrols index f770dbe9..5796b788 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f770dbe9d38214a37e12adb591498dcd1ad0293e +Subproject commit 5796b7885da8f4b9a09d948b782d6353b6eaf715 diff --git a/qtrepotools b/qtrepotools index 94220099..45210131 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 942200994caec36bfc19d9cac4a792eb4f308ee1 +Subproject commit 4521013190bc81ac1deebb27bb0debf34deca6f4 diff --git a/qtsensors b/qtsensors index 330bd714..a7b94516 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 330bd7142dc4ef5682db971306441e7f8852af4e +Subproject commit a7b94516e1412073eb9d3fb57e49315ef966b183 diff --git a/qtserialport b/qtserialport index 381e11d2..ad108e9d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 381e11d264cbb116d37ee83a4be2ed504bffb717 +Subproject commit ad108e9d56e7838eac3726e0492a246086d53e70 diff --git a/qttools b/qttools index 39072302..02402887 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3907230229b0f379169fdef38b96265f422d3e71 +Subproject commit 02402887562f55b822fd29a64437da3d1252fd5b diff --git a/qttranslations b/qttranslations index 160672da..6fbc830e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 160672dab76f526d1035d48eacd83a51e146b5c8 +Subproject commit 6fbc830e0ebeb66a5570e8c432c27658670cd071 diff --git a/qtwayland b/qtwayland index 3dc9cfdb..10fd51a3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3dc9cfdbd2771c28c770d432b99e571db43fe599 +Subproject commit 10fd51a3e69a0a2ee6b8cd151fa6c847f684253c diff --git a/qtwebengine b/qtwebengine index 3f9c6206..d3978d73 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3f9c6206450b0c67a5dadfe0da023ec6be7d1743 +Subproject commit d3978d733ffba103bfd60b53ded1e47fc5b03075 diff --git a/qtwebsockets b/qtwebsockets index a01c1455..12e424f2 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a01c1455afecc2a98598a574f69ce682586357ff +Subproject commit 12e424f241b29ef26ad2a3a70740d8b320e9e85a diff --git a/qtxmlpatterns b/qtxmlpatterns index eefb48c8..670b2073 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit eefb48c8568876527b1d85f00d34a45d62d8a6f8 +Subproject commit 670b2073c0b1c40f5b67fc36c18ed15fe2cdfee2 From f835537d9fe8076aaf7a8b6311dbdf30b01d1900 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 23 Sep 2015 22:33:27 +0300 Subject: [PATCH 4/8] Updated submodules. Change-Id: Ie4b9dc169153021a9204b6fdf3af9f58228fdf3e Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 07d4113f..113a51b6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 07d4113f8f94bddf12437ac3205dce1b6d8fab7d +Subproject commit 113a51b61540b1db74b78d30c04fb979b05f210c diff --git a/qtconnectivity b/qtconnectivity index b31cbd7c..869547fc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b31cbd7c5d6b16a20035ace6675835356b69fd65 +Subproject commit 869547fc4fb4b94e97c81989cf85da85d588328b diff --git a/qtlocation b/qtlocation index d1c91515..63b118c7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d1c91515ef0ad4208c41a4052f92bfb817333aca +Subproject commit 63b118c7da215d994e1695797fd44c2ad35298c3 diff --git a/qtqa b/qtqa index 5cb6ae7e..25b525e7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5cb6ae7e79059a8350b74771f656a0a6c408fc1f +Subproject commit 25b525e7017a5fd8035077719ef66505883fa3a4 diff --git a/qtrepotools b/qtrepotools index 45210131..2cdbcc84 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4521013190bc81ac1deebb27bb0debf34deca6f4 +Subproject commit 2cdbcc846c2d5ec233ea5189d1eb92c1d48b6c36 diff --git a/qtsensors b/qtsensors index a7b94516..6a16281a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a7b94516e1412073eb9d3fb57e49315ef966b183 +Subproject commit 6a16281aceedb713676e16c3074e6f7ea1e70b79 diff --git a/qtwebengine b/qtwebengine index d3978d73..6c957003 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d3978d733ffba103bfd60b53ded1e47fc5b03075 +Subproject commit 6c957003de0619fb63dda7e07577bb3b971cd721 From 063e5f899e0d33d5afe15dfb00221bd5d93aab3b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Sep 2015 22:33:21 +0300 Subject: [PATCH 5/8] Updated submodules. Change-Id: If835537d9fe8076aaf7a8b6311dbdf30b01d1900 Reviewed-by: Liang Qi Reviewed-by: Jani Heikkinen --- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtqa b/qtqa index 25b525e7..f5df7096 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25b525e7017a5fd8035077719ef66505883fa3a4 +Subproject commit f5df7096578ada814d6485d9b7a8eafb468fc6ad diff --git a/qtquickcontrols b/qtquickcontrols index 5796b788..6a9c9710 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5796b7885da8f4b9a09d948b782d6353b6eaf715 +Subproject commit 6a9c9710aa7f2b7bd6fd09f27f8bb352d496bc25 diff --git a/qtrepotools b/qtrepotools index 2cdbcc84..854c5377 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 2cdbcc846c2d5ec233ea5189d1eb92c1d48b6c36 +Subproject commit 854c5377227f1543ec55231811e02a073e6ae1a6 From c1fbc6dfde579eaba980664444feaf9083dd4d39 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Sep 2015 22:14:30 +0300 Subject: [PATCH 6/8] Updated submodules. Change-Id: I063e5f899e0d33d5afe15dfb00221bd5d93aab3b Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 113a51b6..7943d4f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 113a51b61540b1db74b78d30c04fb979b05f210c +Subproject commit 7943d4f77c721da17b6be76cf1045d34654a8cc5 diff --git a/qtqa b/qtqa index f5df7096..dca19142 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f5df7096578ada814d6485d9b7a8eafb468fc6ad +Subproject commit dca1914237fd5d1fb6398d4de5e85591db94917c From 2579c442085495cd179d00e09285797bbb08b3eb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Oct 2015 21:55:08 +0300 Subject: [PATCH 7/8] Updated submodules. Change-Id: Ic1fbc6dfde579eaba980664444feaf9083dd4d39 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 7943d4f7..da104e7d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7943d4f77c721da17b6be76cf1045d34654a8cc5 +Subproject commit da104e7db04a5aeafb99a7b0ef3ab3cdd08da272 From 57d4fc9ceb05b39b7a832ddc1d8d4fcc1321f859 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Oct 2015 21:17:41 +0300 Subject: [PATCH 8/8] Updated submodules. Change-Id: I2579c442085495cd179d00e09285797bbb08b3eb Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index da104e7d..6542161d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit da104e7db04a5aeafb99a7b0ef3ab3cdd08da272 +Subproject commit 6542161d5c698d461a11f0e5ca6cc2a00d33a824