From 451f0a193b42d40256caafcaa39572afe7cd04f3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 10 Apr 2015 12:10:34 +0200 Subject: [PATCH 1/9] Adjust submodule branches Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68 --- .gitmodules | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitmodules b/.gitmodules index a184119b..68766085 100644 --- 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 From 39ce0228dad0d141df17ea5f911046130f823467 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Apr 2015 12:51:37 +0300 Subject: [PATCH 2/9] Updated submodules. Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtwayland | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 70c22cb8..58e96368 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 70c22cb89f1c923c71cbc1a477c862fd947161e6 +Subproject commit 58e9636802bec0d62f6ceade6fc78f4ecb402310 diff --git a/qtbase b/qtbase index cd61b6c9..1b4ce373 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cd61b6c969dee74776ad7e9f3dcf1e1623b1059b +Subproject commit 1b4ce37371252d54ddd08c0e5325d0385217ef26 diff --git a/qtconnectivity b/qtconnectivity index b4bf2345..c331ca56 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b4bf23453e65995bdd8827b6e146edd5cafeddc3 +Subproject commit c331ca56de42944cd43910ad56aa8f1ff2cad773 diff --git a/qtdeclarative b/qtdeclarative index 47f6d256..79d56651 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 47f6d256edf76a8a201057236226b507bcc1aa89 +Subproject commit 79d56651edc05133ebae13bb93733373b10380f9 diff --git a/qtdoc b/qtdoc index 49460b38..e6576602 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 49460b3840e74f6c07e377c4168f0256ec1ccea7 +Subproject commit e6576602b0dca2b728b541b9471dd922dff231b6 diff --git a/qtlocation b/qtlocation index b13fec3c..f88c90a7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b13fec3c7ed08b7d0e79c08312a3c3285eb20ef3 +Subproject commit f88c90a7965968d0a0c49fd109edf650218a99d2 diff --git a/qtmultimedia b/qtmultimedia index ddec9254..20dbf849 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ddec92543f10d0d16455ba5ba4f450c3fe417644 +Subproject commit 20dbf8490e8226e96898d9b0ef6edd5f9a87bff2 diff --git a/qtqa b/qtqa index 2c60d8bb..42a07eb4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 2c60d8bb991aecc208cc8501cbd05bf7089fa20d +Subproject commit 42a07eb4f5d9b3bc869fecf3e6c874c718186ed9 diff --git a/qtquickcontrols b/qtquickcontrols index de9145dc..8fa384b1 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit de9145dcd904068256e28e130fdfda2e8014efe8 +Subproject commit 8fa384b13a6483e69bfdc1b1eae1871eb1b68c54 diff --git a/qtrepotools b/qtrepotools index b2735807..590f6514 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit b27358073f18c43b48bd279c89ee13380648aa7e +Subproject commit 590f651476265a01ea6f3d14b1607838c08e7cc2 diff --git a/qtsensors b/qtsensors index 9cf0b4ed..317ae4fd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9cf0b4ed7a8979d124ef0c222084816cca8c1f0a +Subproject commit 317ae4fd9fa643d89deddfa16d05d98dcc459fda diff --git a/qtwayland b/qtwayland index edd339d2..d5e7965a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit edd339d2b38e504a1e288bbd1cf352d1ae009247 +Subproject commit d5e7965a87d81e2d7157c785403b0aba681de62a diff --git a/qtwebkit b/qtwebkit index 80471d52..586bdc38 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 80471d52c85ab8edd1332e084b8bf46f44571c3b +Subproject commit 586bdc38324dfaeec65389bf7646c82cb35db017 diff --git a/qtwinextras b/qtwinextras index f5c36a8f..2e25b089 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f5c36a8fce4bd6790682df6786a1498e1b3dccf0 +Subproject commit 2e25b08920323870ef84473131dce1e190f430c4 From 11963ba9f0141fc72dadedffe2c36fba5be16186 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 May 2015 05:18:06 +0300 Subject: [PATCH 3/9] Updated submodules. Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 1b4ce373..1f281bfd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b4ce37371252d54ddd08c0e5325d0385217ef26 +Subproject commit 1f281bfd63402b50f3db378a027da26ca52ffb27 From f7cb995d04fdc05b35df8b6c5215bf530006b984 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 May 2015 21:17:33 +0300 Subject: [PATCH 4/9] Updated submodules. Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 1f281bfd..3a726628 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1f281bfd63402b50f3db378a027da26ca52ffb27 +Subproject commit 3a726628f13c8f46b447cf0844eb8a5b740a1993 diff --git a/qtdoc b/qtdoc index e6576602..d140fdcb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e6576602b0dca2b728b541b9471dd922dff231b6 +Subproject commit d140fdcbee0f48aeb435e71bc92698f5acc72fe5 diff --git a/qtqa b/qtqa index 42a07eb4..88f367c0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 42a07eb4f5d9b3bc869fecf3e6c874c718186ed9 +Subproject commit 88f367c0266e9a072767fdf4a99beb239760a06d From 24f1b3219d1db41acc3f0781fa38f253bcb04da3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 May 2015 15:17:59 +0300 Subject: [PATCH 5/9] Updated submodules. Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 3a726628..d14397b7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3a726628f13c8f46b447cf0844eb8a5b740a1993 +Subproject commit d14397b7298879e260bc7218a5f7539b6b94a2cf diff --git a/qtqa b/qtqa index 88f367c0..408ceaf9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 88f367c0266e9a072767fdf4a99beb239760a06d +Subproject commit 408ceaf9ea73cb8e3ddf83eea8704b46693cc103 From dfffbfdc266be3f52f716b152bbcb70810127cc9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 15 May 2015 21:17:21 +0300 Subject: [PATCH 6/9] Updated submodules. Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index d14397b7..18928002 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d14397b7298879e260bc7218a5f7539b6b94a2cf +Subproject commit 189280026f091716dfda91ff652cc20b299683c2 diff --git a/qtqa b/qtqa index 408ceaf9..3fdc5e31 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 408ceaf9ea73cb8e3ddf83eea8704b46693cc103 +Subproject commit 3fdc5e31660d99a090b09c416a591a4b48a8f497 From 07856d73e19b60fbc01ff650cddb1d557db35617 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 May 2015 21:17:49 +0300 Subject: [PATCH 7/9] Updated submodules. Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 18928002..d4a296b5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 189280026f091716dfda91ff652cc20b299683c2 +Subproject commit d4a296b538da93f5c915fc7e886c6995f1b41169 diff --git a/qtqa b/qtqa index 3fdc5e31..f6a5dfc9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3fdc5e31660d99a090b09c416a591a4b48a8f497 +Subproject commit f6a5dfc9ad67cf353e230578cf3201514f01674a diff --git a/qtwebengine b/qtwebengine index b0c48cb3..6a2c3043 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b0c48cb3a0c9630899a357fb8a01ba13ccad5395 +Subproject commit 6a2c3043e7d49e696821688242b098215bd677fa diff --git a/qtwebkit b/qtwebkit index 586bdc38..8b264715 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 586bdc38324dfaeec65389bf7646c82cb35db017 +Subproject commit 8b2647154aa08a498624fa144d55fdefbeebe320 From 670466b6a3ff58edb40c91ff86c443cd6dd20126 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 May 2015 14:04:52 +0300 Subject: [PATCH 8/9] Updated submodules. Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index d4a296b5..9d662d9d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d4a296b538da93f5c915fc7e886c6995f1b41169 +Subproject commit 9d662d9d2f33d75d3fbf682ee9fadc291ecae5cb diff --git a/qtdoc b/qtdoc index d140fdcb..9e6aabfd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d140fdcbee0f48aeb435e71bc92698f5acc72fe5 +Subproject commit 9e6aabfd68771f2fba9288f130dc7db4ace040bf diff --git a/qtqa b/qtqa index f6a5dfc9..e5948177 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f6a5dfc9ad67cf353e230578cf3201514f01674a +Subproject commit e594817755f8fa2c3c3f5bfd18b67b1e58ebdfc8 From 210493d6412fe1a3d0fce3be500f9d056e497047 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 May 2015 07:26:03 +0300 Subject: [PATCH 9/9] Updated submodules. Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 9d662d9d..e3983c87 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9d662d9d2f33d75d3fbf682ee9fadc291ecae5cb +Subproject commit e3983c87280ade48b243d9c60bed639713851be9