From d6fcb8ba76a691d8aae3486b13b015042c1121fa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Oct 2016 20:10:22 +0300 Subject: [PATCH 01/16] Update submodules on '5.6' in qt5 Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index d3889211..8c4b9eda 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d3889211dc245d44dab25dcc9fbbc4b57e92ac33 +Subproject commit 8c4b9eda3383a469ae47b8dedbf5093c5b4e10df diff --git a/qtbase b/qtbase index 6ea626a3..75b49a59 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ea626a32fe070847629b6715c2a253717ff7412 +Subproject commit 75b49a59db98254ce85bc8f1da08938f4fbb63f8 diff --git a/qtconnectivity b/qtconnectivity index 9dba73f3..052e7ce3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9dba73f30505ed7c220055788fba3cd201848fdb +Subproject commit 052e7ce371d4719df778ad8b378bcf1af14d294b diff --git a/qtdeclarative b/qtdeclarative index 79121a08..a2926972 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 79121a0827df365468a02db20179d2c2d5ae720d +Subproject commit a292697222dd85e586f26bd7133f3e17e30992c2 diff --git a/qtdoc b/qtdoc index f822f094..f1efb2a2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f822f0944a5bc6710df173f3fec67ae1e364ab85 +Subproject commit f1efb2a25bd122d4f7d4b7f4c77fcbd194bc4d2a diff --git a/qtlocation b/qtlocation index 8cb45ab8..a7c7a9bf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8cb45ab8aabaf0246c49e3314e4a84456ff7b061 +Subproject commit a7c7a9bfc1f1d75f23f1e67ba3859e698e2e8965 diff --git a/qtmultimedia b/qtmultimedia index 9d9a29bc..e4c2e764 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9d9a29bcc31101e394ea484f61985cac75524ba1 +Subproject commit e4c2e7648e02922584502f09bff3d3fa21016180 diff --git a/qtqa b/qtqa index e49c7d6f..66911ea5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc +Subproject commit 66911ea5ba5fe6c5e44d40760008dd65efe2e705 diff --git a/qtquickcontrols b/qtquickcontrols index c2356328..768f70e0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c2356328f88b044c8956fe7860c4c04fca4f2c30 +Subproject commit 768f70e05ff4d8521f439d1e9410750bdf98b584 diff --git a/qtrepotools b/qtrepotools index 7b543793..ef0773a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 +Subproject commit ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 diff --git a/qttools b/qttools index 316720b4..d54b8e3a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 316720b417a8360d2dfa24e9f3924fc46ef590e3 +Subproject commit d54b8e3ade43344fa18bc26c0f965432553cf888 diff --git a/qtwebchannel b/qtwebchannel index 3b28a695..7cb2d467 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3b28a6956cb3cab087481312dc82a907b118e0de +Subproject commit 7cb2d467c3421eced44ae7b887b8738cc68595fc diff --git a/qtwebengine b/qtwebengine index 36feb681..2b953bf8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 36feb681a97b3dd690a54d2eafd58081036992f1 +Subproject commit 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 diff --git a/qtwebkit b/qtwebkit index 490b7b65..dbc45568 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 490b7b65edbd06da0818c0ac765ca6ebd219dce3 +Subproject commit dbc4556842aa6541b9c8ce48fe34a36811709e64 diff --git a/qtwebsockets b/qtwebsockets index ef7b03e3..b9692a85 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ef7b03e3e5e20f89963bae799f7ecb753f332c34 +Subproject commit b9692a85087a0c2cab27172bcbfd9d526048cb22 From bb9da70be6142682bad86fc9bf3d2a9c6ebf4abd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Oct 2016 01:00:39 +0300 Subject: [PATCH 02/16] Update submodules on '5.6' in qt5 Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 75b49a59..ebd10463 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 75b49a59db98254ce85bc8f1da08938f4fbb63f8 +Subproject commit ebd1046323615f22192055a94438bf85fc360ca3 From a54d8b1f301a6fb32f150e0b9c4d3dedc40acfcf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Oct 2016 01:00:58 +0300 Subject: [PATCH 03/16] Update submodules on '5.6' in qt5 Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index ebd10463..6d6074e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ebd1046323615f22192055a94438bf85fc360ca3 +Subproject commit 6d6074e04fa55a0e42c7d8970f6db1cc3913a26e diff --git a/qtdeclarative b/qtdeclarative index a2926972..a191de3f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a292697222dd85e586f26bd7133f3e17e30992c2 +Subproject commit a191de3f4dd777e8e60b4d3b5684b59d22be068d diff --git a/qtlocation b/qtlocation index a7c7a9bf..8bc90970 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a7c7a9bfc1f1d75f23f1e67ba3859e698e2e8965 +Subproject commit 8bc909704986209e98feae8057b0e3ce07a28cd8 diff --git a/qttools b/qttools index d54b8e3a..20d14f20 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d54b8e3ade43344fa18bc26c0f965432553cf888 +Subproject commit 20d14f201e2066b3d738dd15e5cb1ca3b1d2f925 From 683e24bd51948f5479cecabb674ab06dd67777d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 13 Oct 2016 01:01:04 +0300 Subject: [PATCH 04/16] Update submodules on '5.6' in qt5 Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwebkit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 6d6074e0..f3ce959d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6d6074e04fa55a0e42c7d8970f6db1cc3913a26e +Subproject commit f3ce959de6c682bdb7e71f7b82742f28a5be1e9c diff --git a/qtdeclarative b/qtdeclarative index a191de3f..af002b8d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a191de3f4dd777e8e60b4d3b5684b59d22be068d +Subproject commit af002b8df9b084fd7f26e9eead9844aab36bdc4d diff --git a/qttools b/qttools index 20d14f20..6b6b7786 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 20d14f201e2066b3d738dd15e5cb1ca3b1d2f925 +Subproject commit 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9 diff --git a/qtwebkit b/qtwebkit index dbc45568..766858f1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit dbc4556842aa6541b9c8ce48fe34a36811709e64 +Subproject commit 766858f1879ed03fcc8776df3bff2cc97dd60a97 From 5706c177a2db23c26f47c701ebd1403a75d8d889 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Oct 2016 21:10:58 +0300 Subject: [PATCH 05/16] Update submodules on '5.6' in qt5 Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 8c4b9eda..1a5a3f92 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8c4b9eda3383a469ae47b8dedbf5093c5b4e10df +Subproject commit 1a5a3f92add2248fb8308bbc40e941d48db8e9b5 diff --git a/qtbase b/qtbase index f3ce959d..f773ddd0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f3ce959de6c682bdb7e71f7b82742f28a5be1e9c +Subproject commit f773ddd026a6227cdb754dea4a5fe0a25137033f diff --git a/qtdeclarative b/qtdeclarative index af002b8d..e858dc47 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit af002b8df9b084fd7f26e9eead9844aab36bdc4d +Subproject commit e858dc4701912c5c4e94a99d819d3a86a6ee92b3 diff --git a/qtdoc b/qtdoc index f1efb2a2..c9c6ab44 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f1efb2a25bd122d4f7d4b7f4c77fcbd194bc4d2a +Subproject commit c9c6ab44470c6b246b4b33a7580113408b3848d3 diff --git a/qtimageformats b/qtimageformats index d7bdc138..d7cd50b3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936 +Subproject commit d7cd50b34731357a30421bbd8561d7fa2e576ded diff --git a/qtmultimedia b/qtmultimedia index e4c2e764..c6462eed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e4c2e7648e02922584502f09bff3d3fa21016180 +Subproject commit c6462eed99827154823e8e9ee07b8cf9311b518d diff --git a/qtrepotools b/qtrepotools index ef0773a1..9f5cfd98 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 +Subproject commit 9f5cfd98722f9b04a7ec1556dee9c77f0977e59c diff --git a/qttools b/qttools index 6b6b7786..64e22217 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9 +Subproject commit 64e22217e166861e5f21a4a171357265e9746497 diff --git a/qtwayland b/qtwayland index 90123a9f..6c92fda9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 90123a9f30ee1173c9d64e415fc9b6e27a4227fc +Subproject commit 6c92fda9a71f00be801fcfc96f5f503b70fa3f00 diff --git a/qtwebchannel b/qtwebchannel index 7cb2d467..1c06ad98 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7cb2d467c3421eced44ae7b887b8738cc68595fc +Subproject commit 1c06ad98a09b64b92c0e86dd79843c9251546b42 diff --git a/qtwebengine b/qtwebengine index 2b953bf8..ee6f018a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 +Subproject commit ee6f018a67b6443100a1454c9ab9a7a897289535 diff --git a/qtwebview b/qtwebview index 16887a02..61e1c61f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 16887a0294346edcdf0a912a69e2da892e4fd0e8 +Subproject commit 61e1c61facaf2cd8194cd9db7413c63c56b2362a From d84827a04c39da25186aa6d0cb691e993e7de850 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Oct 2016 14:58:33 +0300 Subject: [PATCH 06/16] Update submodules on '5.6' in qt5 Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 1a5a3f92..8206e216 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1a5a3f92add2248fb8308bbc40e941d48db8e9b5 +Subproject commit 8206e216c1e9fbe3fd5c7c221d2e471523fd76f7 diff --git a/qtbase b/qtbase index f773ddd0..456f0e0f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f773ddd026a6227cdb754dea4a5fe0a25137033f +Subproject commit 456f0e0f1a4fb422b029c5abd30e2e622435f76a diff --git a/qtcanvas3d b/qtcanvas3d index 6b6bda4c..ef53ec5c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6b6bda4c7fc419112386ca9b4fe89d092bf14cc5 +Subproject commit ef53ec5c8bcdab6b473c78f66e5d24d3aacd08fb diff --git a/qtdeclarative b/qtdeclarative index e858dc47..c849f3a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e858dc4701912c5c4e94a99d819d3a86a6ee92b3 +Subproject commit c849f3a7eff55d60c4010831ec67336c5c0f2a27 diff --git a/qtqa b/qtqa index 66911ea5..8c5bc9ed 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 66911ea5ba5fe6c5e44d40760008dd65efe2e705 +Subproject commit 8c5bc9ede642bd3d77abc0f82b0d8569abbb0e71 diff --git a/qtrepotools b/qtrepotools index 9f5cfd98..c38b38d8 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9f5cfd98722f9b04a7ec1556dee9c77f0977e59c +Subproject commit c38b38d8b6808e74d9f7c0a5c77054c317892fb6 diff --git a/qttools b/qttools index 64e22217..b5cb2223 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 64e22217e166861e5f21a4a171357265e9746497 +Subproject commit b5cb222357841b8dad6fc80aa8e6e88047f20c00 diff --git a/qtwayland b/qtwayland index 6c92fda9..9d3462df 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6c92fda9a71f00be801fcfc96f5f503b70fa3f00 +Subproject commit 9d3462dff33b771b71ef16d797ee01ea10afebbe diff --git a/qtwebengine b/qtwebengine index ee6f018a..785ff563 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ee6f018a67b6443100a1454c9ab9a7a897289535 +Subproject commit 785ff563a73ecc67fdd83ec1e015bbb22570cabb From 3ec0bc325113773ca6a89f4e0e77887ffde43e95 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 28 Oct 2016 21:23:05 +0300 Subject: [PATCH 07/16] Update submodules on '5.6' in qt5 Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 456f0e0f..d16d56a0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 456f0e0f1a4fb422b029c5abd30e2e622435f76a +Subproject commit d16d56a05ee9219ba6b7985b56a7bd69fb248875 diff --git a/qtdeclarative b/qtdeclarative index c849f3a7..1372abd3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c849f3a7eff55d60c4010831ec67336c5c0f2a27 +Subproject commit 1372abd309303b0de61fbb269f6e7f9ad32e1fbd diff --git a/qtlocation b/qtlocation index 8bc90970..3db74efd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8bc909704986209e98feae8057b0e3ce07a28cd8 +Subproject commit 3db74efd86aa0d724ca94bab5168aa9f92d3c18d diff --git a/qtmultimedia b/qtmultimedia index c6462eed..2d43e390 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c6462eed99827154823e8e9ee07b8cf9311b518d +Subproject commit 2d43e390ba36230df24de4346f76c67358357add diff --git a/qtsvg b/qtsvg index 78bc4273..aed47778 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 78bc427395116bfaf3d99134f42aec5310020f8e +Subproject commit aed47778b6677f3a4ca5f87e806191f25de3c6a9 diff --git a/qtwebengine b/qtwebengine index 785ff563..c4de6daf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 785ff563a73ecc67fdd83ec1e015bbb22570cabb +Subproject commit c4de6dafb00fdaf278d33798d709beb9fa7cfd78 From 6fd9e533a3f24a695975a37b8e954ad593a44801 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 30 Oct 2016 13:12:37 +0200 Subject: [PATCH 08/16] Update submodules on '5.6' in qt5 Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index d16d56a0..694702e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d16d56a05ee9219ba6b7985b56a7bd69fb248875 +Subproject commit 694702e09d9b17d91db282784f009178cfb1059b diff --git a/qtwebengine b/qtwebengine index c4de6daf..ba6acb2b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c4de6dafb00fdaf278d33798d709beb9fa7cfd78 +Subproject commit ba6acb2bc25add0f8b4490d8760b7ad1c1f27629 From fbd782636b6ee413d2b6e8bca408263297194254 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 19 Oct 2016 12:06:20 +0200 Subject: [PATCH 09/16] Clean up usage of qtsvg as dependency There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9bcdf4ce..6dc85870 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative + recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git branch = 5.6 @@ -159,7 +159,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 From 647afd7f4187840dd1a1d2a00bccfa4badf43d0f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Nov 2016 09:02:05 +0200 Subject: [PATCH 10/16] Update submodules on '5.6' in qt5 Change-Id: I3f4f3b15e3528c319c1479759282571759477faf Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 694702e0..ca4d93d8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 694702e09d9b17d91db282784f009178cfb1059b +Subproject commit ca4d93d85ee446c5e30ec8e7814651e45cbf1218 diff --git a/qtconnectivity b/qtconnectivity index 052e7ce3..b6bf84ed 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 052e7ce371d4719df778ad8b378bcf1af14d294b +Subproject commit b6bf84ed241a74d796a435163019c6a1c5af12af diff --git a/qtdeclarative b/qtdeclarative index 1372abd3..5861ea79 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1372abd309303b0de61fbb269f6e7f9ad32e1fbd +Subproject commit 5861ea797da3ff3ce86e81a35af007648b732efd diff --git a/qtdoc b/qtdoc index c9c6ab44..ec340ad3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c9c6ab44470c6b246b4b33a7580113408b3848d3 +Subproject commit ec340ad35f9d8331b9d2b9d1b1e8442ae195cf98 diff --git a/qtlocation b/qtlocation index 3db74efd..09868ace 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3db74efd86aa0d724ca94bab5168aa9f92d3c18d +Subproject commit 09868ace97177fbeb7198a844113f47065102b1b diff --git a/qtmultimedia b/qtmultimedia index 2d43e390..75b4283f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2d43e390ba36230df24de4346f76c67358357add +Subproject commit 75b4283fb05d07fb8654e031f266e9918f1ae647 diff --git a/qtquickcontrols b/qtquickcontrols index 768f70e0..094ad30c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 768f70e05ff4d8521f439d1e9410750bdf98b584 +Subproject commit 094ad30c94a72784449f43ef06d2172d644ab0fd diff --git a/qtwebengine b/qtwebengine index ba6acb2b..a4b04e4c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ba6acb2bc25add0f8b4490d8760b7ad1c1f27629 +Subproject commit a4b04e4c2613cb600680eea5697b2775a765147b diff --git a/qtxmlpatterns b/qtxmlpatterns index 66be7fd2..6b6f7db3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 66be7fd267fa432f79a9f2bb6edc6a76285a7f39 +Subproject commit 6b6f7db32e7c9ca4bdda0341994dca1212b53e20 From 4cbc319413df1328df002dec311e6015977f8ec8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 4 Nov 2016 10:47:28 +0200 Subject: [PATCH 11/16] Update submodules on '5.6' in qt5 Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index ca4d93d8..4b6784b4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ca4d93d85ee446c5e30ec8e7814651e45cbf1218 +Subproject commit 4b6784b49c6dcf0add9ec0cbb4ad97cd191c2aa3 diff --git a/qtconnectivity b/qtconnectivity index b6bf84ed..cb439dd5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6bf84ed241a74d796a435163019c6a1c5af12af +Subproject commit cb439dd54878c546a85b1ed1282bca7e340875c0 diff --git a/qtlocation b/qtlocation index 09868ace..e0c93fc1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 09868ace97177fbeb7198a844113f47065102b1b +Subproject commit e0c93fc1530f1a325f2ac514fb61e6b9f78872d0 diff --git a/qtwebengine b/qtwebengine index a4b04e4c..6bb3d98e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a4b04e4c2613cb600680eea5697b2775a765147b +Subproject commit 6bb3d98e47d89790049edca796843345b8fd3c8b From 71ed40b0ace06eaa54ec41b2ad622911a94643be Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 Nov 2016 18:59:19 +0100 Subject: [PATCH 12/16] fix cloning of tagged versions the .gitmodules of tagged commits typically refers to a release branch which was deleted shortly after the release. consequently, git clone --branch is bound to fail. of course, cloning a fixed sha1/tag requires no branch in the first place, so revert back to using git clone --no-checkout in that case. amends ac6168c0c. Task-number: QTBUG-49133 Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc Reviewed-by: Robert Loehning Reviewed-by: Edward Welbourne --- init-repository | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/init-repository b/init-repository index 954237d0..f7ba27e9 100755 --- a/init-repository +++ b/init-repository @@ -389,7 +389,8 @@ sub git_clone_all_submodules } foreach my $module (@modules) { - $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module}); + $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, + $co_branch && $subbranches{$module}); } if ($co_branch) { @@ -482,7 +483,11 @@ sub git_clone_one_submodule my $do_clone = (! -e "$submodule/.git"); if ($do_clone) { - push @reference_args, '--branch', $branch if ($branch); + if ($branch) { + push @reference_args, '--branch', $branch; + } else { + push @reference_args, '--no-checkout'; + } $self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule); } From d9141a32be8566365f9582a0c09b626a811f62d1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Nov 2016 14:26:39 +0200 Subject: [PATCH 13/16] Update submodules on '5.6' in qt5 Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index 8206e216..6c248da9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8206e216c1e9fbe3fd5c7c221d2e471523fd76f7 +Subproject commit 6c248da9fc6715ed5bf26cb4105792e0b0964da0 diff --git a/qtactiveqt b/qtactiveqt index e5878886..ad9f1fe7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e5878886ed8261fb5d3e1fb93595be03e8f12b8d +Subproject commit ad9f1fe77d5f607d617f8402d3475dbc6ddcb998 diff --git a/qtandroidextras b/qtandroidextras index d973d761..389bfef9 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit d973d761c5722ee21106f84ca5db89bb58c103d1 +Subproject commit 389bfef95d5002c08769e63bff33d7cce8597c4d diff --git a/qtbase b/qtbase index 4b6784b4..3c2cb87d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4b6784b49c6dcf0add9ec0cbb4ad97cd191c2aa3 +Subproject commit 3c2cb87de2554b9c4f6e2080768fe9ede00aeab3 diff --git a/qtcanvas3d b/qtcanvas3d index ef53ec5c..05b1d1e5 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ef53ec5c8bcdab6b473c78f66e5d24d3aacd08fb +Subproject commit 05b1d1e5cfbdefd4ad3ad34c224b50fbd8575ca1 diff --git a/qtconnectivity b/qtconnectivity index cb439dd5..d146e48b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cb439dd54878c546a85b1ed1282bca7e340875c0 +Subproject commit d146e48b72cd8d27dd32eda09650c2c645967e4e diff --git a/qtdeclarative b/qtdeclarative index 5861ea79..f4ac007f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5861ea797da3ff3ce86e81a35af007648b732efd +Subproject commit f4ac007f4a19bc095ff15d415a6629986de78e49 diff --git a/qtdoc b/qtdoc index ec340ad3..05850a2b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ec340ad35f9d8331b9d2b9d1b1e8442ae195cf98 +Subproject commit 05850a2b46c7d888647d2236c137a0d9fb88170b diff --git a/qtenginio b/qtenginio index 6c37300c..e4478184 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 6c37300c667e3049178f049a5b86e7ea955c9671 +Subproject commit e447818458c9211e95ee5e75e294f76b6abf32d4 diff --git a/qtimageformats b/qtimageformats index d7cd50b3..e6deda52 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7cd50b34731357a30421bbd8561d7fa2e576ded +Subproject commit e6deda527721f94133d5715f5c34a170c043f3d1 diff --git a/qtlocation b/qtlocation index e0c93fc1..c1755c75 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e0c93fc1530f1a325f2ac514fb61e6b9f78872d0 +Subproject commit c1755c75f8d54a27ff931a049d6fd9718c0be6bb diff --git a/qtmacextras b/qtmacextras index 15c849dc..8bfec987 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 15c849dcfded8818765e439f521a665ae12e707a +Subproject commit 8bfec9876a81ea7db7cd225464cae6d5576103bd diff --git a/qtmultimedia b/qtmultimedia index 75b4283f..3d9ef4d4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 75b4283fb05d07fb8654e031f266e9918f1ae647 +Subproject commit 3d9ef4d41718adc9a9099964eb4f964d1d3b63df diff --git a/qtqa b/qtqa index 8c5bc9ed..cd6bd183 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8c5bc9ede642bd3d77abc0f82b0d8569abbb0e71 +Subproject commit cd6bd183192764546bd7f0909a5bad3848b9d18a diff --git a/qtquick1 b/qtquick1 index 5eab543c..2c47447f 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 5eab543c5c955f5057225b9bdb6b2757516dbd3e +Subproject commit 2c47447f0bea43539f764c0e9c518775d7f73074 diff --git a/qtquickcontrols b/qtquickcontrols index 094ad30c..a650a999 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 094ad30c94a72784449f43ef06d2172d644ab0fd +Subproject commit a650a999ecac4fba95a430e5d9d85b4ad812ca50 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e93c73c0..6fd334e5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e93c73c0aa15cd973e008a04a70a7c69719ad244 +Subproject commit 6fd334e59cab4ae0cd0c587fe2f64cf302ba1f21 diff --git a/qtrepotools b/qtrepotools index c38b38d8..973462d6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c38b38d8b6808e74d9f7c0a5c77054c317892fb6 +Subproject commit 973462d65beec6e6208f867bcc6f44ffd34dfa0c diff --git a/qtscript b/qtscript index b4eb16b7..2f7093a2 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b4eb16b7ffd7d281610765eab4332036d7d8f81c +Subproject commit 2f7093a2497a9efb38035521c082ed590968c508 diff --git a/qtsensors b/qtsensors index 72400841..5d1b3831 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 724008411c16aaf8fa25c09745e20d0d47d65721 +Subproject commit 5d1b3831b42163f5a46edc7d6f4865ce73281f28 diff --git a/qtserialbus b/qtserialbus index 0d31e8cd..20adfdf1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0d31e8cd10d09fd2b28052c89a4f96c32c104848 +Subproject commit 20adfdf12e29149c589310a065b0259130ac51f0 diff --git a/qtserialport b/qtserialport index dd179422..3bd02564 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dd17942259cf0cbe834f504128d522c93020ea84 +Subproject commit 3bd025649c0641e11ae557544d9949d5dcc6cf51 diff --git a/qtsvg b/qtsvg index aed47778..4704ecbf 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aed47778b6677f3a4ca5f87e806191f25de3c6a9 +Subproject commit 4704ecbf79053f2e1cde3c869b03c769be6ef207 diff --git a/qttools b/qttools index b5cb2223..c84dcdd5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b5cb222357841b8dad6fc80aa8e6e88047f20c00 +Subproject commit c84dcdd59af82b972b0dee115e95e8aa91b28c50 diff --git a/qtwayland b/qtwayland index 9d3462df..f7a386ee 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9d3462dff33b771b71ef16d797ee01ea10afebbe +Subproject commit f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba diff --git a/qtwebchannel b/qtwebchannel index 1c06ad98..9cd01a4e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1c06ad98a09b64b92c0e86dd79843c9251546b42 +Subproject commit 9cd01a4efb45e244d7b541e870be01c8d045a8ae diff --git a/qtwebengine b/qtwebengine index 6bb3d98e..5fc3be56 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6bb3d98e47d89790049edca796843345b8fd3c8b +Subproject commit 5fc3be56ea6c1d7b1b7567ce429774e92859dd14 diff --git a/qtwebkit b/qtwebkit index 766858f1..7c3f338f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 766858f1879ed03fcc8776df3bff2cc97dd60a97 +Subproject commit 7c3f338f042acebe7cf56de319bfb26a16d1aca3 diff --git a/qtwebsockets b/qtwebsockets index b9692a85..a70af02e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b9692a85087a0c2cab27172bcbfd9d526048cb22 +Subproject commit a70af02e46239edd6807ef8bf908b25116235a75 diff --git a/qtwebview b/qtwebview index 61e1c61f..c98c779c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 61e1c61facaf2cd8194cd9db7413c63c56b2362a +Subproject commit c98c779c6474af2f7c347957c6eac4f5e217b988 diff --git a/qtwinextras b/qtwinextras index 9ca1e678..0ea8b505 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 9ca1e678976d06d23b236011a3a55a025a272320 +Subproject commit 0ea8b50500c27aabce83de55d02935ea6faaaeec diff --git a/qtx11extras b/qtx11extras index df10edcf..94153d86 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit df10edcfae328f397c99192b322268c9e96f6dab +Subproject commit 94153d86a8c882b44f2523cca1cacdf3537e1283 diff --git a/qtxmlpatterns b/qtxmlpatterns index 6b6f7db3..4dc384b7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6b6f7db32e7c9ca4bdda0341994dca1212b53e20 +Subproject commit 4dc384b7ae2b944d7d7c28c566abe52bce825502 From 357d29a0028e5ef9f725bbbac682d1e2033b9d97 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Oct 2016 11:15:04 +0200 Subject: [PATCH 14/16] add --no-fetch option there is no point in re-fetching all repositories just because an update failed due to local modifications. Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb Reviewed-by: Edward Welbourne Reviewed-by: Oswald Buddenhagen --- init-repository | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/init-repository b/init-repository index f7ba27e9..842af7d1 100755 --- a/init-repository +++ b/init-repository @@ -82,6 +82,9 @@ Options: --no-update Skip the `git submodule update' command. + --no-fetch + Skip the `git fetch' commands. Implied by --no-update. + --branch Instead of checking out specific SHA1s, check out the submodule branches that correspond with the current supermodule commit. By @@ -213,6 +216,7 @@ sub parse_arguments 'ignore-submodules' => 0 , 'mirror-url' => "", 'update' => 1 , + 'fetch' => 1 , 'module-subset' => "default", ); @@ -227,6 +231,7 @@ sub parse_arguments 'mirror=s' => \$self->{qw{ mirror-url }}, 'quiet' => \$self->{qw{ quiet }}, 'update!' => \$self->{qw{ update }}, + 'fetch!' => \$self->{qw{ fetch }}, 'module-subset=s' => \$self->{qw{ module-subset }}, 'help|?' => sub { printUsage(1); }, @@ -245,6 +250,8 @@ sub parse_arguments $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon,deprecated/; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; + $self->{'fetch'} = 0 if (!$self->{'update'}); + return; } @@ -466,9 +473,11 @@ sub git_clone_one_submodule } } + my $do_clone = (! -e "$submodule/.git"); + my $url = $self->{'base-url'}.$repo_basename; my $mirror; - if ($mirror_url) { + if ($mirror_url && ($do_clone || $self->{fetch})) { $mirror = $mirror_url.$repo_basename; } @@ -481,7 +490,6 @@ sub git_clone_one_submodule } } - my $do_clone = (! -e "$submodule/.git"); if ($do_clone) { if ($branch) { push @reference_args, '--branch', $branch; @@ -501,14 +509,14 @@ sub git_clone_one_submodule $self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*'); } - if (!$do_clone && $self->{update}) { + if (!$do_clone && $self->{fetch}) { # If we didn't clone, fetch from the right location. We always update # the origin remote, so that submodule update --remote works. $self->exe('git', 'config', 'remote.origin.url', ($mirror ? $mirror : $url)); $self->exe('git', 'fetch', 'origin'); } - if (!($do_clone || $self->{update}) || $mirror) { + if (!($do_clone || $self->{fetch}) || $mirror) { # Leave the origin configured to the canonical URL. It's already correct # if we cloned/fetched without a mirror; otherwise it may be anything. $self->exe('git', 'config', 'remote.origin.url', $url); From 6773d4ef94fa6d74b7361fd10f5bc7550542a50b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Oct 2016 11:30:48 +0200 Subject: [PATCH 15/16] produce less ugly paths to the commit template in submodules Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230 Reviewed-by: Simon Hausmann Reviewed-by: Edward Welbourne --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 842af7d1..52efb201 100755 --- a/init-repository +++ b/init-repository @@ -522,7 +522,7 @@ sub git_clone_one_submodule $self->exe('git', 'config', 'remote.origin.url', $url); } - my $template = getcwd()."/../.commit-template"; + my $template = $orig_cwd."/.commit-template"; if (-e $template) { $self->exe('git', 'config', 'commit.template', $template); } From 98c92cc95f82a0998eed4d36f8b3ed6277be8ca2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Nov 2016 20:02:47 +0200 Subject: [PATCH 16/16] Update submodules on '5.6' in qt5 Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 3c2cb87d..f2205c48 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3c2cb87de2554b9c4f6e2080768fe9ede00aeab3 +Subproject commit f2205c48c21a6b135f2f59d0cf46e72f90f9f0f4 diff --git a/qtdeclarative b/qtdeclarative index f4ac007f..4ef8b7e7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f4ac007f4a19bc095ff15d415a6629986de78e49 +Subproject commit 4ef8b7e7a8a93b2921560db8cf021f89409154e5 diff --git a/qtdoc b/qtdoc index 05850a2b..771e871a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 05850a2b46c7d888647d2236c137a0d9fb88170b +Subproject commit 771e871aef5aac605819d1ee5242aa0b751872bf diff --git a/qtlocation b/qtlocation index c1755c75..81f626f0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c1755c75f8d54a27ff931a049d6fd9718c0be6bb +Subproject commit 81f626f062d95abe49fcb7d8f098e54646c04034 diff --git a/qtquickcontrols b/qtquickcontrols index a650a999..fccb5baf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a650a999ecac4fba95a430e5d9d85b4ad812ca50 +Subproject commit fccb5baf490b9a8c561a01f30b4992236e3a2060