From acafa69d57531bb2c1ad3a98beee7ae22aa77077 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Aug 2016 21:26:25 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I92e5272d0d0662bfed36e2fa51d25b729e89a172 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtxmlpatterns | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index db3baec2..b0300b98 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit db3baec236841f9390e9450772838cb7ba878069 +Subproject commit b0300b98b3a428f73d77f2d3a7f027b032c46d2f diff --git a/qtbase b/qtbase index dbfd7f30..121b7b7a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbfd7f304c4d91096e104ec2383d92a37502d836 +Subproject commit 121b7b7a3cb401cb1597b8d56b9372f09aae6b51 diff --git a/qtdeclarative b/qtdeclarative index 6839f030..45f79dc7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6839f03051d2950e4721cbb5ee88fa7b07109588 +Subproject commit 45f79dc7e572c1a1e4c40633d5055d0c6741cfbe diff --git a/qtxmlpatterns b/qtxmlpatterns index 30a40418..2b1daadb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 30a4041893c8132040cd982c9ca1204345801750 +Subproject commit 2b1daadb2a5516c0939192861c1e25ecbadf5826 -- cgit v1.2.3 From fc1d30a4470318250b57aff7f0bae81026fab187 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 7 Aug 2016 02:30:48 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I59475dd0549f9c4c83ad830a76b3b5225aa90eda Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index b0300b98..5dc4c774 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0300b98b3a428f73d77f2d3a7f027b032c46d2f +Subproject commit 5dc4c77408ff040dc4a50c3837f4b2a29e927cb8 -- cgit v1.2.3 From 5c5e807018cff0f807ce850da50a14e693c4365b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Aug 2016 02:30:47 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I0f7724142af344e35897035016b03ce046c8164e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index 5dc4c774..98279960 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5dc4c77408ff040dc4a50c3837f4b2a29e927cb8 +Subproject commit 98279960e47d62411d04aa76c9ba1e7850962649 -- cgit v1.2.3 From b0bfbf3bf0883643abff52d0c89cbd2fff9c2630 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Aug 2016 09:07:34 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 595c6abf..89d7c904 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 595c6abf9d2cb666f2502bbf89ab3a7052717027 +Subproject commit 89d7c904e5f7c0cd230e59a4cd8b2ee2a1cbcac1 diff --git a/qtdeclarative b/qtdeclarative index ffe113ab..35597f30 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ffe113ab628adf6c22e96a22cf0bcda8e80c290d +Subproject commit 35597f301480ffc59f598be4de2c2074543725be diff --git a/qtdoc b/qtdoc index dba1dc7d..24e62a03 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dba1dc7d6b93b55b5b303b12e2f7549dc7c68ca2 +Subproject commit 24e62a03c775699a6447d861df3e5f7dc1b115b4 diff --git a/qtlocation b/qtlocation index 3ab62395..114674f7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3ab6239530810b482d6033bac3d781acea8453ac +Subproject commit 114674f7d8bf4c1e919d42d76ce34ad43830ed09 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index eed9b9dd..05b06e9c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit eed9b9dd83f0db9cbfe794072d8f5147e3d1234a +Subproject commit 05b06e9ce410127fb7210ef00c0723e0bb1868b6 diff --git a/qtrepotools b/qtrepotools index 43f97c04..9711d12c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 43f97c047703ef4f11f80507fea1f48e7de2de91 +Subproject commit 9711d12c074559a7c9a37e678c5e6b1fa205fea1 diff --git a/qtserialport b/qtserialport index 133dbd59..b0e3e746 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 133dbd59fb04974149d2140b267fce91a7cfd4a2 +Subproject commit b0e3e7469cf5249bb395d044c5344bbe88884553 diff --git a/qttools b/qttools index bda7ece9..efa8c336 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bda7ece99a8162118a91e9f475c149be39846ecd +Subproject commit efa8c3361bea905afef1a051900275bf33ccb9ef diff --git a/qtwayland b/qtwayland index da364484..b3b4778c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit da364484aa51ce7c73d39ce0ca444169ce69588e +Subproject commit b3b4778c237c43cfde02c4750017c37112c315c4 diff --git a/qtwebengine b/qtwebengine index ffd68f2d..bde1c73d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ffd68f2d472968b092957c40f3c46c9c70242126 +Subproject commit bde1c73d92dc353f2d5c4e93425d8e86bf672caa diff --git a/qtwebkit b/qtwebkit index f010d89f..28010af8 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit f010d89fa2e4aa463d3392c5f37fa22efd48e04e +Subproject commit 28010af899d96024c7336363687873144f4f2a82 diff --git a/qtwinextras b/qtwinextras index 4d09bf3d..75385854 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4d09bf3dd58b1ccf67a8f6e9623964684b6f231a +Subproject commit 75385854e5973b28d13055d8896cb00380951466 -- cgit v1.2.3 From 40e137cbee26f926cf99d51d3f9d5a930c4cbe15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Aug 2016 02:30:43 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 98279960..8858f42c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 98279960e47d62411d04aa76c9ba1e7850962649 +Subproject commit 8858f42cba558c46efd5f021819ae269cf697b89 diff --git a/qtbase b/qtbase index 121b7b7a..04e676c0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 121b7b7a3cb401cb1597b8d56b9372f09aae6b51 +Subproject commit 04e676c03cf7c320bd5c5a21dfcb62613af711b6 diff --git a/qtcharts b/qtcharts index c121fb4a..a7b80c0b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c121fb4ad00bc9617a011e040ef5ed695610a504 +Subproject commit a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 diff --git a/qtdeclarative b/qtdeclarative index 45f79dc7..580f2872 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 45f79dc7e572c1a1e4c40633d5055d0c6741cfbe +Subproject commit 580f2872f09cf7ad83ec9ae5dca686683a3cac80 diff --git a/qtdoc b/qtdoc index a684f23e..d7373219 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a684f23ecb5e99ba2ac73b0a412ae8d1f29b4f28 +Subproject commit d737321990acbaea2073e025bffff339ab7a216c diff --git a/qtmultimedia b/qtmultimedia index 29a46aa4..586abbd9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 29a46aa4ac38bf9faedbaca6d1c191d38d2db079 +Subproject commit 586abbd9732f9ccce127429fe0698c25a09ecefb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b63d182d..cf2db0c7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b63d182dc2ab737a814bdee06f20907bec9c26eb +Subproject commit cf2db0c7d64441d1d2da783de1df5404990ebb89 diff --git a/qtrepotools b/qtrepotools index 43f97c04..9711d12c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 43f97c047703ef4f11f80507fea1f48e7de2de91 +Subproject commit 9711d12c074559a7c9a37e678c5e6b1fa205fea1 diff --git a/qttools b/qttools index cb72077e..72901b92 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cb72077e562a5a53e52f7ac94b0c3c26320c6242 +Subproject commit 72901b9295394034ac52cd6174e6b50fa19a317d diff --git a/qtwayland b/qtwayland index 19cdda76..33ad940c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 19cdda76e8e1803c3c36252088e2f8d756e7cbea +Subproject commit 33ad940cddf0a9529f205fe645f1b1d76f6f04f1 diff --git a/qtwebengine b/qtwebengine index 80135638..4b5c9024 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 801356387748f237b7dc24f9772774573fd83ef0 +Subproject commit 4b5c9024175043ee6ad4b9066ee81f4774c3dcf6 -- cgit v1.2.3 From 2ed6386fe39c4bf8c16d8e889ad9f267e48b4e3f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Aug 2016 01:00:58 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I4821c386e318139e13ad228983c43c1b1d978494 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 7fab1fa6..d3889211 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7fab1fa65675dfd62b1ddf6fed3226e465b37b67 +Subproject commit d3889211dc245d44dab25dcc9fbbc4b57e92ac33 diff --git a/qtbase b/qtbase index 89d7c904..d9e66f63 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 89d7c904e5f7c0cd230e59a4cd8b2ee2a1cbcac1 +Subproject commit d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 diff --git a/qtdeclarative b/qtdeclarative index 35597f30..6f15de1d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35597f301480ffc59f598be4de2c2074543725be +Subproject commit 6f15de1d2da9c83d7fca1d5c8243c0d69a1390ee diff --git a/qtdoc b/qtdoc index 24e62a03..aebe202e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 24e62a03c775699a6447d861df3e5f7dc1b115b4 +Subproject commit aebe202ec85d3a8a04772713786ffab838101934 diff --git a/qtlocation b/qtlocation index 114674f7..9eba88b3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 114674f7d8bf4c1e919d42d76ce34ad43830ed09 +Subproject commit 9eba88b32e3908326c0ae5c37b55df0a5f5be9cd diff --git a/qtmacextras b/qtmacextras index b8e24de4..15c849dc 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit b8e24de4ba0876a3686cf5da5b1b6f47603c1bc7 +Subproject commit 15c849dcfded8818765e439f521a665ae12e707a diff --git a/qtmultimedia b/qtmultimedia index 7966aca3..c30eeb5b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7966aca38451ed9ef32ac0fb1b344cdbf22521bb +Subproject commit c30eeb5b7486caa31cdb0f9279de2f78fed89c54 diff --git a/qtquickcontrols b/qtquickcontrols index 756a169e..56d71166 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 756a169e2530987f1b875589d196877e93704858 +Subproject commit 56d711667f4601016b474b3d463ce07659c42b9a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 05b06e9c..e93c73c0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 05b06e9ce410127fb7210ef00c0723e0bb1868b6 +Subproject commit e93c73c0aa15cd973e008a04a70a7c69719ad244 diff --git a/qtwayland b/qtwayland index b3b4778c..1bc3b0fd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b3b4778c237c43cfde02c4750017c37112c315c4 +Subproject commit 1bc3b0fdc8d934c1ab69a902054681896b56d672 diff --git a/qtwebengine b/qtwebengine index bde1c73d..feebf85d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bde1c73d92dc353f2d5c4e93425d8e86bf672caa +Subproject commit feebf85d13af90628e12715888e4a1385db8e2f3 diff --git a/qtwebsockets b/qtwebsockets index e66dcd51..ef7b03e3 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e66dcd51d0e5517e88cd59912fd08501522a2902 +Subproject commit ef7b03e3e5e20f89963bae799f7ecb753f332c34 -- cgit v1.2.3 From 2556777f36bd583e1f70c49eac51e2e3da54bf56 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Aug 2016 01:01:01 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index d9e66f63..17d68c4f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 +Subproject commit 17d68c4fc371c32bd58d0a94ac63f0170edaf29e diff --git a/qtcanvas3d b/qtcanvas3d index 2821ee4b..2778071f 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2821ee4b3bc6cb7fe79fcd79c908cfde9eb86bff +Subproject commit 2778071f6c80b5397a183db37114aef881ade855 diff --git a/qtdeclarative b/qtdeclarative index 6f15de1d..b1eeb7cd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6f15de1d2da9c83d7fca1d5c8243c0d69a1390ee +Subproject commit b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717 diff --git a/qtlocation b/qtlocation index 9eba88b3..fafc1584 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9eba88b32e3908326c0ae5c37b55df0a5f5be9cd +Subproject commit fafc158427e9d54298ce5c3419c1d4b6ec3b946e diff --git a/qtmultimedia b/qtmultimedia index c30eeb5b..c9de25fa 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c30eeb5b7486caa31cdb0f9279de2f78fed89c54 +Subproject commit c9de25fa342ff8066d49541179c30d0ce45950b4 diff --git a/qtquick1 b/qtquick1 index e90625f0..5eab543c 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit e90625f00a3727ca1c89a94407b7686327d03c19 +Subproject commit 5eab543c5c955f5057225b9bdb6b2757516dbd3e diff --git a/qtquickcontrols b/qtquickcontrols index 56d71166..c0f58d52 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 56d711667f4601016b474b3d463ce07659c42b9a +Subproject commit c0f58d5283ce981b8cfbc43f602a3b6553e26ce2 diff --git a/qttools b/qttools index efa8c336..85197ddb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit efa8c3361bea905afef1a051900275bf33ccb9ef +Subproject commit 85197ddb8d6da0e5cf74b8d945c076d4db3986a8 diff --git a/qtwebengine b/qtwebengine index feebf85d..b7fde78d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit feebf85d13af90628e12715888e4a1385db8e2f3 +Subproject commit b7fde78d7822ed7f2221acfd9db15b3ff579e29d diff --git a/qtwebkit b/qtwebkit index 28010af8..bad5ece6 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 28010af899d96024c7336363687873144f4f2a82 +Subproject commit bad5ece677263b1fd025ae2305896abbcb0b94a6 -- cgit v1.2.3 From af364a39aafc2f8213fbc2b97688177472abed6f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Aug 2016 02:30:49 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 8858f42c..925435c0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8858f42cba558c46efd5f021819ae269cf697b89 +Subproject commit 925435c04b056875390b63057d9b86906c4747ad diff --git a/qtbase b/qtbase index 04e676c0..c0ccea7e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 04e676c03cf7c320bd5c5a21dfcb62613af711b6 +Subproject commit c0ccea7efe56ca5115097f32f13cf3398ecc2d34 diff --git a/qtdeclarative b/qtdeclarative index 580f2872..c0f3c8ae 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 580f2872f09cf7ad83ec9ae5dca686683a3cac80 +Subproject commit c0f3c8ae5cee3ecda1ac8829336aa95cbe4d330e diff --git a/qtgamepad b/qtgamepad index 42dbf471..e5066759 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 42dbf4712ed9815b457ec80a2ed56de685fb2b63 +Subproject commit e5066759bf5d5848bec88683a371f31346a315b4 diff --git a/qtlocation b/qtlocation index 19642842..d5619b17 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 19642842cea91a4588828362eba023c5da5ab57b +Subproject commit d5619b17b3133f0aa17331c07ccb9d2b0626d7d6 diff --git a/qtmultimedia b/qtmultimedia index 586abbd9..820205e6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 586abbd9732f9ccce127429fe0698c25a09ecefb +Subproject commit 820205e604a5f281238c23464638fdff72b969d1 diff --git a/qttools b/qttools index 72901b92..3c5fa29f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 72901b9295394034ac52cd6174e6b50fa19a317d +Subproject commit 3c5fa29f78816d8cc7fd9fa6e9462e2a9f283f64 diff --git a/qtwebengine b/qtwebengine index 4b5c9024..6e4d1a0c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4b5c9024175043ee6ad4b9066ee81f4774c3dcf6 +Subproject commit 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 -- cgit v1.2.3 From 6cfd3a2118228038999e9f3da081101d9cf8061e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 15 Aug 2016 09:49:48 +0200 Subject: fix branches of qtpim and qtsystems these repos were definitely _not_ branched for 5.7. Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313 Reviewed-by: Friedemann Kleint Reviewed-by: Liang Qi --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b88ba6a4..1f3780f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,7 +110,7 @@ recommends = qtdeclarative path = qtsystems url = ../qtsystems.git - branch = 5.7 + branch = dev status = ignore [submodule "qtfeedback"] depends = qtdeclarative @@ -129,7 +129,7 @@ depends = qtdeclarative path = qtpim url = ../qtpim.git - branch = 5.7 + branch = dev status = ignore [submodule "qtconnectivity"] depends = qtbase -- cgit v1.2.3 From 2dcb31a181929f61b247c8f2177a1aa8ef04d779 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Aug 2016 12:40:02 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 7fe90b93..1de9d68b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7fe90b93e5f29dc2174e2050e31ee03e814be84c +Subproject commit 1de9d68b2631de9432ab9929bb4b917604cc7be7 diff --git a/qtbase b/qtbase index 17d68c4f..881bda9e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 17d68c4fc371c32bd58d0a94ac63f0170edaf29e +Subproject commit 881bda9e6ecdd8729edf7df68f94f72f5d7c9042 diff --git a/qtconnectivity b/qtconnectivity index f5fe6ce4..95513185 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f5fe6ce47841be34d4b851725d80133ff6d14fee +Subproject commit 95513185fd90cb9372a8cb8b541de7a3f41b12d4 diff --git a/qtdeclarative b/qtdeclarative index b1eeb7cd..01a9c006 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717 +Subproject commit 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c diff --git a/qtmultimedia b/qtmultimedia index c9de25fa..a52aa624 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c9de25fa342ff8066d49541179c30d0ce45950b4 +Subproject commit a52aa624e69fa618aa0d29c2a147a7d472751de1 diff --git a/qtqa b/qtqa index bedd8eaf..241894af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bedd8eaf5d4fc917736b18975d53efb5a92f751d +Subproject commit 241894afcef4469fa9d678da44c475b20fedc10b diff --git a/qtquickcontrols b/qtquickcontrols index c0f58d52..5bd57528 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c0f58d5283ce981b8cfbc43f602a3b6553e26ce2 +Subproject commit 5bd57528b5cf7b22a81b1195d90b0a364c0428aa diff --git a/qtrepotools b/qtrepotools index 9711d12c..471da8d4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9711d12c074559a7c9a37e678c5e6b1fa205fea1 +Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 diff --git a/qtserialbus b/qtserialbus index 0c63b3a4..b6be80ed 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0c63b3a441437a8bc42770d360a6696bbf11cd2d +Subproject commit b6be80ed75231b0ac3b853e4729837ab994301f9 diff --git a/qttools b/qttools index 85197ddb..f067e5d7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 85197ddb8d6da0e5cf74b8d945c076d4db3986a8 +Subproject commit f067e5d7e510842825be883dade904a9a4d3ec05 diff --git a/qtwayland b/qtwayland index 1bc3b0fd..2cc75804 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1bc3b0fdc8d934c1ab69a902054681896b56d672 +Subproject commit 2cc758045e322873ad58f675a70c8d8366b5c318 diff --git a/qtwebengine b/qtwebengine index b7fde78d..e9b510bb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b7fde78d7822ed7f2221acfd9db15b3ff579e29d +Subproject commit e9b510bbf2b1311761c2a2f98d4410ab9b17f9e5 diff --git a/qtwebkit b/qtwebkit index bad5ece6..bb43bca1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bad5ece677263b1fd025ae2305896abbcb0b94a6 +Subproject commit bb43bca1664721401c3a2c25b585913bb5e8cb4f -- cgit v1.2.3 From 42ed864856f1b8c7175a8effcdd8be647ad9bc6c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Aug 2016 02:30:46 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 925435c0..87e6c4b9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 925435c04b056875390b63057d9b86906c4747ad +Subproject commit 87e6c4b98a48ec53493b56265328ed8d2d02e19c diff --git a/qtbase b/qtbase index c0ccea7e..ca979a2f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c0ccea7efe56ca5115097f32f13cf3398ecc2d34 +Subproject commit ca979a2f69a36712d2bf4d3e4b5b9009c1779a50 diff --git a/qtcharts b/qtcharts index a7b80c0b..d352d707 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 +Subproject commit d352d707f95c3c4e213585361a3ec737389e301e diff --git a/qtdeclarative b/qtdeclarative index c0f3c8ae..8b7dbfe1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c0f3c8ae5cee3ecda1ac8829336aa95cbe4d330e +Subproject commit 8b7dbfe1e0c0d4b8d0984fb381f1a0bb6b566e76 diff --git a/qtimageformats b/qtimageformats index 167f91be..ca1370e2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 167f91bebe2ee53fcd13d843dc9e0aad80b92d82 +Subproject commit ca1370e27a4f86771809b4499da9dc61807ba03e diff --git a/qtlocation b/qtlocation index d5619b17..05d2e10a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d5619b17b3133f0aa17331c07ccb9d2b0626d7d6 +Subproject commit 05d2e10a98475b35d54942cd53e3aecd621ac073 diff --git a/qtqa b/qtqa index bedd8eaf..69be0b6e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bedd8eaf5d4fc917736b18975d53efb5a92f751d +Subproject commit 69be0b6ead7056b6383b5f55a99923a7a14f625b diff --git a/qtquickcontrols b/qtquickcontrols index 22fab150..efdd81ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 22fab1502f562bccb3c16dde0288aa867e3b094a +Subproject commit efdd81ce80b018b7b5779876e94f1b722af7fb9a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cf2db0c7..6beb454e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cf2db0c7d64441d1d2da783de1df5404990ebb89 +Subproject commit 6beb454e2ca4ce6a25ae1637d8dd9d395a18443c diff --git a/qtrepotools b/qtrepotools index 9711d12c..471da8d4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9711d12c074559a7c9a37e678c5e6b1fa205fea1 +Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 diff --git a/qtscxml b/qtscxml index a3bfb9e7..63ec7e2f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a3bfb9e792e4a8dd5f16a4b51d45c3af0eaae80d +Subproject commit 63ec7e2ff9f5f63ff32c1fb874fd7de8b5bfdb02 diff --git a/qtwayland b/qtwayland index 33ad940c..e23550aa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 33ad940cddf0a9529f205fe645f1b1d76f6f04f1 +Subproject commit e23550aaa4336fcba125f81cd498f4a15e41f5b7 diff --git a/qtwebengine b/qtwebengine index 6e4d1a0c..7bc32104 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 +Subproject commit 7bc32104660dd9b5dfa9920a288797a7c2790559 diff --git a/qtwebkit b/qtwebkit index d9ca6bcb..01676ca2 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 +Subproject commit 01676ca2ffb25adfe331a3b50792ac99687d5319 -- cgit v1.2.3 From 66ffe13b50be44fb99a6ff3f6bc171f21f9735cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Aug 2016 01:01:02 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 881bda9e..e52fcb7d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 881bda9e6ecdd8729edf7df68f94f72f5d7c9042 +Subproject commit e52fcb7dc78c83586c813f55f087a98bae4eaa0e diff --git a/qtconnectivity b/qtconnectivity index 95513185..21e7cb1b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 95513185fd90cb9372a8cb8b541de7a3f41b12d4 +Subproject commit 21e7cb1bafdfc06c263e10067d02f9b103ff660f diff --git a/qtdeclarative b/qtdeclarative index 01a9c006..7179846a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c +Subproject commit 7179846a0141c2683c30d03c43a7c12fde98801f diff --git a/qtlocation b/qtlocation index fafc1584..14fac7ee 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fafc158427e9d54298ce5c3419c1d4b6ec3b946e +Subproject commit 14fac7ee65202b0af7032aaade16d1611bc43731 diff --git a/qtmultimedia b/qtmultimedia index a52aa624..6d95682d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a52aa624e69fa618aa0d29c2a147a7d472751de1 +Subproject commit 6d95682d7ff282180655f2f384d8aba69c4f67af diff --git a/qtqa b/qtqa index 241894af..69be0b6e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 241894afcef4469fa9d678da44c475b20fedc10b +Subproject commit 69be0b6ead7056b6383b5f55a99923a7a14f625b diff --git a/qtquickcontrols b/qtquickcontrols index 5bd57528..69b3136b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5bd57528b5cf7b22a81b1195d90b0a364c0428aa +Subproject commit 69b3136bae16897492d27558c5909cd61a5e598e diff --git a/qtsensors b/qtsensors index 8b79fc4e..46d9a630 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf +Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 diff --git a/qtserialbus b/qtserialbus index b6be80ed..c8305c87 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b6be80ed75231b0ac3b853e4729837ab994301f9 +Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 diff --git a/qttranslations b/qttranslations index 4925f90e..225e1740 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4925f90e9ceb0b4081649d1fc1eec10beb65f722 +Subproject commit 225e1740fec4559bf8d66d915ddd06b9d4f48119 diff --git a/qtwayland b/qtwayland index 2cc75804..f2124674 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2cc758045e322873ad58f675a70c8d8366b5c318 +Subproject commit f21246748ce20cd86346e192fe0c4c76a9b08a7c diff --git a/qtwebengine b/qtwebengine index e9b510bb..3ddbb2cc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e9b510bbf2b1311761c2a2f98d4410ab9b17f9e5 +Subproject commit 3ddbb2cc3e74e3803c1a36a38715b93b88a3e16d diff --git a/qtwebview b/qtwebview index 20c00be8..aad32ba9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 20c00be872220f547211b87a2d3d34e12bd0f3d8 +Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 -- cgit v1.2.3 From 68a5a649ab6b2015ffdd30639b7a7f4cf1949154 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Sep 2016 06:59:28 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index e52fcb7d..4e53159d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e52fcb7dc78c83586c813f55f087a98bae4eaa0e +Subproject commit 4e53159d431e39c03488517588669ae2cc9052d1 diff --git a/qtdeclarative b/qtdeclarative index 7179846a..c14c382e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7179846a0141c2683c30d03c43a7c12fde98801f +Subproject commit c14c382e6e8527be1129788ccca31309b032f99c diff --git a/qtlocation b/qtlocation index 14fac7ee..7504b2ce 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 14fac7ee65202b0af7032aaade16d1611bc43731 +Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 diff --git a/qtmultimedia b/qtmultimedia index 6d95682d..6817067f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d95682d7ff282180655f2f384d8aba69c4f67af +Subproject commit 6817067ff72c4493ab39fd065c9382568da06378 diff --git a/qtqa b/qtqa index 69be0b6e..1c973844 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 69be0b6ead7056b6383b5f55a99923a7a14f625b +Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 diff --git a/qtquickcontrols b/qtquickcontrols index 69b3136b..846d04ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 69b3136bae16897492d27558c5909cd61a5e598e +Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 diff --git a/qttools b/qttools index f067e5d7..a9e5e09f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f067e5d7e510842825be883dade904a9a4d3ec05 +Subproject commit a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e diff --git a/qtwebengine b/qtwebengine index 3ddbb2cc..44f41d30 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3ddbb2cc3e74e3803c1a36a38715b93b88a3e16d +Subproject commit 44f41d30ed3efce2f1970dcd158555b41b38014d -- cgit v1.2.3 From 64f62b4b95ba3ed13262be47c225db559abdd86f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Sep 2016 02:30:49 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 87e6c4b9..79aeeba8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 87e6c4b98a48ec53493b56265328ed8d2d02e19c +Subproject commit 79aeeba87d3c17b4f652423a660a213f9e2faf25 diff --git a/qtbase b/qtbase index ca979a2f..fa2aef5e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ca979a2f69a36712d2bf4d3e4b5b9009c1779a50 +Subproject commit fa2aef5eb8f1a28a79e253a006f348e62afef58a diff --git a/qtcharts b/qtcharts index d352d707..bf26aa9d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d352d707f95c3c4e213585361a3ec737389e301e +Subproject commit bf26aa9d15e525fdcf6fd3f59268418533f06790 diff --git a/qtconnectivity b/qtconnectivity index dc1e5850..ecc2ca9e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dc1e5850237660df4c64c5ed29e5f7824be6ce81 +Subproject commit ecc2ca9e9e6b98e8da7c7d223cfa5eb5257591d6 diff --git a/qtdeclarative b/qtdeclarative index 8b7dbfe1..48dce247 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8b7dbfe1e0c0d4b8d0984fb381f1a0bb6b566e76 +Subproject commit 48dce24717ca537a6f5d817b2f5cd689df86ad68 diff --git a/qtdoc b/qtdoc index d7373219..02bf1659 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d737321990acbaea2073e025bffff339ab7a216c +Subproject commit 02bf1659f701d222ad3f95f82f13948a75635e79 diff --git a/qtmultimedia b/qtmultimedia index 820205e6..da7d462e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 820205e604a5f281238c23464638fdff72b969d1 +Subproject commit da7d462e315fb101fc9112a294b5ca2e3bd35a75 diff --git a/qtqa b/qtqa index 69be0b6e..1c973844 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 69be0b6ead7056b6383b5f55a99923a7a14f625b +Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 diff --git a/qtquickcontrols b/qtquickcontrols index efdd81ce..abe319c9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit efdd81ce80b018b7b5779876e94f1b722af7fb9a +Subproject commit abe319c9cb811832bb4c9c95290564dfa7b3603a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6beb454e..61ed2a96 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6beb454e2ca4ce6a25ae1637d8dd9d395a18443c +Subproject commit 61ed2a96c7e87193d37b8b6f1ab03469e294ba41 diff --git a/qtsvg b/qtsvg index 55825068..4469fbec 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 55825068ab0e3102bf5f8843c0cccab1ff120ae1 +Subproject commit 4469fbecd4e004979dada2da72573c06719fee3c diff --git a/qtwayland b/qtwayland index e23550aa..2f83f449 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e23550aaa4336fcba125f81cd498f4a15e41f5b7 +Subproject commit 2f83f4490b6c644bb02fa6bf9d88e87492418723 diff --git a/qtwebengine b/qtwebengine index 7bc32104..3cc14885 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7bc32104660dd9b5dfa9920a288797a7c2790559 +Subproject commit 3cc148853f0f7468526df9dd2397a70a8eeeedae -- cgit v1.2.3 From cb6b46a516fd6b862ad72650bd0a6ad3337189c6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Sep 2016 01:00:45 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 4e53159d..24bd7fd6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4e53159d431e39c03488517588669ae2cc9052d1 +Subproject commit 24bd7fd6518985f00e4102c2702ef50a8852b731 diff --git a/qtmultimedia b/qtmultimedia index 6817067f..a8fe4b98 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6817067ff72c4493ab39fd065c9382568da06378 +Subproject commit a8fe4b989b2002d3fcb4e33afe16bd6fd2ff192b -- cgit v1.2.3 From 25ee5c337cdb6f84f44f9643a30ec2a62974d43d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Sep 2016 01:00:58 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce Reviewed-by: Qt Submodule Update Bot Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 24bd7fd6..bd9f3c50 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 24bd7fd6518985f00e4102c2702ef50a8852b731 +Subproject commit bd9f3c50df9ad782b49eb47edf6264f8c4e8ac74 diff --git a/qtconnectivity b/qtconnectivity index 21e7cb1b..fc3c1d9e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21e7cb1bafdfc06c263e10067d02f9b103ff660f +Subproject commit fc3c1d9e3b330b49d0442252966e6682ff0e2488 diff --git a/qtdeclarative b/qtdeclarative index c14c382e..03e64ff6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c14c382e6e8527be1129788ccca31309b032f99c +Subproject commit 03e64ff6e60ebb2c0ea1b9f408d82367e68b6514 diff --git a/qtqa b/qtqa index 1c973844..e49c7d6f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 +Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc diff --git a/qtquickcontrols b/qtquickcontrols index 846d04ce..ffcdd1d6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 +Subproject commit ffcdd1d6742986e46920919800a382ecf7b58011 diff --git a/qtsvg b/qtsvg index 2d55b499..1ffd91a8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2d55b4996eaa26c973afdf15f6f703c0a1840a96 +Subproject commit 1ffd91a8a0c7ddb901b3c91f0f5e475811994e59 diff --git a/qttools b/qttools index a9e5e09f..1285db5b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e +Subproject commit 1285db5b12c6041a5d1c55d07113ce75a9d76e3a diff --git a/qtwayland b/qtwayland index f2124674..a96dec76 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f21246748ce20cd86346e192fe0c4c76a9b08a7c +Subproject commit a96dec760b19c85c67fb0cca649c22a12e7f51f5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 07457130..66be7fd2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 074571305e45d30066b199641eb5d0866e3b0a92 +Subproject commit 66be7fd267fa432f79a9f2bb6edc6a76285a7f39 -- cgit v1.2.3 From 33feec0dc8000d1c02d65bddea29c00e89904c65 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Sep 2016 19:38:54 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 79aeeba8..88ca1827 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 79aeeba87d3c17b4f652423a660a213f9e2faf25 +Subproject commit 88ca1827cf6532b0e8d4fbacb4bc87a515c2cff4 diff --git a/qtbase b/qtbase index fa2aef5e..cf88d744 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa2aef5eb8f1a28a79e253a006f348e62afef58a +Subproject commit cf88d74466cd6506875676ef2557c179d72fe422 diff --git a/qtlocation b/qtlocation index 05d2e10a..c78af343 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 05d2e10a98475b35d54942cd53e3aecd621ac073 +Subproject commit c78af3434956645b68dd13ab6b8a945239c5782c diff --git a/qtqa b/qtqa index 1c973844..e49c7d6f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 +Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 61ed2a96..9ae57848 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 61ed2a96c7e87193d37b8b6f1ab03469e294ba41 +Subproject commit 9ae57848671419b2622e254af8642fef7b1b7c33 diff --git a/qttools b/qttools index 3c5fa29f..781efbab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3c5fa29f78816d8cc7fd9fa6e9462e2a9f283f64 +Subproject commit 781efbabf32e4438ae9c698ce498cc32cc900c57 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2b1daadb..332ef472 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2b1daadb2a5516c0939192861c1e25ecbadf5826 +Subproject commit 332ef472a9597822cd29da143f27c8e4083af621 -- cgit v1.2.3 From f1de674fd9c1d2007982b139c0ade2052efd126a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 2 Sep 2016 15:44:52 +0300 Subject: Android sdk and ndk to provisioning for qt5.6 Install latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f Reviewed-by: Simon Hausmann --- .../android_sdk_linux.sh | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh new file mode 100644 index 00000000..81132d9b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh @@ -0,0 +1,105 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Android sdk and ndk. + +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and build-tools version 23.0.3 + +# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. + +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkVersion="android-sdk_r24.4.1-linux.tgz" +sdkBuildToolsVersion="23.0.3" +sdkApiLevel="android-18" +sdkUrl="$baseUrl/$sdkVersion" +sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" +sdkTargetFile="$targetFolder/$sdkVersion" +sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" +sdkFolderName="android-sdk-linux" +sdkName="sdk" + +# NDK +ndkVersion="android-ndk-r10e-linux-x86_64.zip" +ndkUrl="$baseUrl/$ndkVersion" +ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" +ndkTargetFile="$targetFolder/$ndkVersion" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-r10e" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo chmod 755 $targetFile + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:users $targetFolder/$folderName + sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" + sudo rm -fr $targetFolder/$version +} + +sudo mkdir $targetFolder +# Install Android SDK +echo "Installing Android SDK version $sdkVersion..." +InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkVersion..." +InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName + +# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." +echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" + +# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 +# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. +echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc + -- cgit v1.2.3