From acafa69d57531bb2c1ad3a98beee7ae22aa77077 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Aug 2016 21:26:25 +0300 Subject: [PATCH 01/58] 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 From fc1d30a4470318250b57aff7f0bae81026fab187 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 7 Aug 2016 02:30:48 +0300 Subject: [PATCH 02/58] 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 From 5c5e807018cff0f807ce850da50a14e693c4365b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Aug 2016 02:30:47 +0300 Subject: [PATCH 03/58] 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 From 7efeb26af74105d53538f095ff1d1cab3f4398ee Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Aug 2016 11:06:22 +0200 Subject: [PATCH 04/58] Adjust submodule branches Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d --- .gitmodules | 76 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitmodules b/.gitmodules index 977a8947..121c1197 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.8 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.8 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.8 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.8 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.8 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.8 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = dev + branch = 5.8 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.8 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.8 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.8 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = dev + branch = 5.8 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = dev + branch = 5.8 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.8 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.8 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.8 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.8 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.8 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.8 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.8 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.8 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.8 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.8 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.8 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.8 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.8 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.8 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,82 +226,82 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.8 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.8 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.8 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.8 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.8 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.8 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.8 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.8 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.8 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.8 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = dev + branch = 5.8 status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = dev + branch = 5.8 status = preview [submodule "qtspeech"] depends = qtbase From b0bfbf3bf0883643abff52d0c89cbd2fff9c2630 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Aug 2016 09:07:34 +0300 Subject: [PATCH 05/58] 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 From 40e137cbee26f926cf99d51d3f9d5a930c4cbe15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Aug 2016 02:30:43 +0300 Subject: [PATCH 06/58] 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 From 2ed6386fe39c4bf8c16d8e889ad9f267e48b4e3f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Aug 2016 01:00:58 +0300 Subject: [PATCH 07/58] 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 From 2556777f36bd583e1f70c49eac51e2e3da54bf56 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Aug 2016 01:01:01 +0300 Subject: [PATCH 08/58] 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 From af364a39aafc2f8213fbc2b97688177472abed6f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Aug 2016 02:30:49 +0300 Subject: [PATCH 09/58] 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 From 6cfd3a2118228038999e9f3da081101d9cf8061e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 15 Aug 2016 09:49:48 +0200 Subject: [PATCH 10/58] 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 From 2dcb31a181929f61b247c8f2177a1aa8ef04d779 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Aug 2016 12:40:02 +0200 Subject: [PATCH 11/58] 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 From 56fc6bc77bb111fe146ecdf67c690a3ce3922685 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 12 Aug 2016 09:49:26 +0300 Subject: [PATCH 12/58] Removed TP status from qtscxml and qtserialbus Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index fdb72689..8877c2c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -183,7 +183,7 @@ path = qtserialbus url = ../qtserialbus.git branch = 5.8 - status = preview + status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport @@ -302,7 +302,7 @@ path = qtscxml url = ../qtscxml branch = 5.8 - status = preview + status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia From 7831d61e8248b5d78cba2143c032461b067c0210 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Aug 2016 16:28:09 +0300 Subject: [PATCH 13/58] Update submodules on '5.8' in qt5 Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1 Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qt3d b/qt3d index 6ebef79d..f37222ce 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6ebef79d390c79cd5ed792b96faa46d60737d366 +Subproject commit f37222cecb804b154a38b37607b21577de4c5e8c diff --git a/qtbase b/qtbase index 955b2bdf..95c767f5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 955b2bdfc0cb1d707f8914be230e5e00c548b6ab +Subproject commit 95c767f5be3cd42b4ed79eeed6fd4aa6cc29dc16 diff --git a/qtcanvas3d b/qtcanvas3d index 8ba6dec8..a0408361 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 8ba6dec8b2adf79826d31ae00c048564025e86c3 +Subproject commit a04083615e23d4951b20554f421206c5d46d9872 diff --git a/qtcharts b/qtcharts index 2817f58b..d43d429e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2817f58b59837689717635d3213d169307f4baa8 +Subproject commit d43d429ea710b1885719b131b2acac42cd955ccb diff --git a/qtconnectivity b/qtconnectivity index 1e31c702..77b5b58b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1e31c7028208bd267dfd513b036b6a7a78118226 +Subproject commit 77b5b58b182e09b4f9f0c8b0d8b0f907fe8578ae diff --git a/qtdeclarative b/qtdeclarative index 234e7622..8eeede61 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 234e762265f0b538e65d610751b8488cb596824d +Subproject commit 8eeede619f417904cbd33fd44143f857dfce0996 diff --git a/qtdoc b/qtdoc index effeb8fd..cb23e64e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit effeb8fde1c5211fee0258116ffab98cfecb54fe +Subproject commit cb23e64e8615fef8e43faeba064e4f641b63dca7 diff --git a/qtgamepad b/qtgamepad index 914f1130..f4bd1e26 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 914f113067fc770b93b27df17f5aa81a7ba7bad1 +Subproject commit f4bd1e26876c5e2ebf5e39b0f087b232b1dd875a diff --git a/qtimageformats b/qtimageformats index fd61bbad..d3ac5245 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit fd61bbad4be0b9e839f882f9681f0732d2bbce38 +Subproject commit d3ac5245d024d78b1366839174fca557778ded98 diff --git a/qtlocation b/qtlocation index 6f34c2ac..6a68408f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6f34c2ac75bdbfb679b5f4767006ad6a373cabb1 +Subproject commit 6a68408fd36eebf32e1131e9e7b6559c4ef9cec4 diff --git a/qtmultimedia b/qtmultimedia index 26827755..cc124467 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 268277552bd65119a72c75c9eb792cd0a70859bd +Subproject commit cc12446728d00161116d6e1823e161440415d2d5 diff --git a/qtpurchasing b/qtpurchasing index 82dcabc5..4aa95af0 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 82dcabc583242caa8fe4291f6e34e5380ff4d79d +Subproject commit 4aa95af07083abe28d61143379427f4418dcf678 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 dc1d9581..817d6971 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit dc1d95819365202e2745faffe31e13d928742c4c +Subproject commit 817d6971ebf75d0b276a93e1ee15d4826ba76c30 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e9855d8a..0524ddb9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e9855d8ac8afed5371330f4f83f7b7dd51d9026f +Subproject commit 0524ddb9489cd9816fadc330f75efc7b40994013 diff --git a/qtrepotools b/qtrepotools index 43f97c04..471da8d4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 43f97c047703ef4f11f80507fea1f48e7de2de91 +Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 diff --git a/qtscxml b/qtscxml index 16348dfb..71087745 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 16348dfb793da0601ddd1bfae4da4ed2eca74e22 +Subproject commit 71087745a8b34e1d73139df63fbfb9f1bb6b9fcd diff --git a/qtserialport b/qtserialport index 8fa108de..df8d69c0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8fa108de666e815053c6e586f1efabc592ae20a5 +Subproject commit df8d69c000c0a91101aa40f2f66b11a694745392 diff --git a/qtspeech b/qtspeech index aa24a101..d65fe883 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit aa24a101e89871a1df056952466ca774b30d1ef2 +Subproject commit d65fe883aaadc95a52dc929cb078320b14d5c4f0 diff --git a/qtsvg b/qtsvg index 29cc2a47..4c44cffd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 29cc2a47b9548e1002e981b43eec10fbf8af9790 +Subproject commit 4c44cffd7b376900fc41169365ae03c7c65d95b6 diff --git a/qttools b/qttools index 517d8268..5b38f448 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 517d8268eb3b96fa7e43ef406c9d1999614418c5 +Subproject commit 5b38f4489539eebd93a5fca5cc6de105868faa9d diff --git a/qttranslations b/qttranslations index 154f6a90..64f3b105 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 154f6a90b0fe0726138de8aba1dc23bea0d45232 +Subproject commit 64f3b105fb67d813512b287be6fdaec409d6d943 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f8ec4e6a..e6e149c6 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f8ec4e6a1b1356700c165ee703465fe2bbb827b3 +Subproject commit e6e149c6d72c2824d4f9361baf09cea6ef3baa2c diff --git a/qtwayland b/qtwayland index 8bd79c7d..768a28b2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8bd79c7d37bc5dc72e9fffb43e01bd7ddc93b94f +Subproject commit 768a28b284fa806cba38f864c56ba2e2c37296f2 diff --git a/qtwebengine b/qtwebengine index 179463fd..eeac120e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 179463fd2b17343dae291ab6f7617311bcfbdb75 +Subproject commit eeac120ec135e2ab0bd02f399afb50b684d00298 diff --git a/qtwebkit b/qtwebkit index ab6df191..f5e23333 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit ab6df191029eeeb0b0f16f127d553265659f739e +Subproject commit f5e23333e851def3a556cb979ca77e6c7a9fb0bf diff --git a/qtwebsockets b/qtwebsockets index 32c3d9bb..ec201d18 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 32c3d9bb5a8825296cdfc92ffeeb44f74efbb638 +Subproject commit ec201d18949e4f5af0ab3804ef87aba75fba8f7f diff --git a/qtwinextras b/qtwinextras index 11c1390b..904b4130 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 11c1390b44cc0398ae8739eb2e7a440140fa6176 +Subproject commit 904b4130be7c4ce2c91ca57864b373938a4ed237 diff --git a/qtx11extras b/qtx11extras index 643447cc..6143e155 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 643447cca3703f3473e0d21bf18e20fa382bc07a +Subproject commit 6143e155ad1370f97a24b5ea965c753887082074 diff --git a/qtxmlpatterns b/qtxmlpatterns index 33b456b7..0171940a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 33b456b7868f05817a4da898ff01de4552a28986 +Subproject commit 0171940a5395bdffc2ce696a6f75a5b97cd27c5b From 42ed864856f1b8c7175a8effcdd8be647ad9bc6c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Aug 2016 02:30:46 +0300 Subject: [PATCH 14/58] 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 From 31d827740414482880ad899aaf1995820da70a64 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 26 Aug 2016 12:56:24 +0200 Subject: [PATCH 15/58] Remove qtsystems from the list of recommended modules in qtlocation QtSystems is not a supported module at the moment, and the code in QtLocation to utilize QtSystems is behind an #ifdef and destined for removal. Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e Reviewed-by: Alex Blasche --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 8877c2c5..1e4cc51b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -93,7 +93,7 @@ priority = 50 [submodule "qtlocation"] depends = qtbase - recommends = qtdeclarative qtquickcontrols qtserialport qtsystems + recommends = qtdeclarative qtquickcontrols qtserialport path = qtlocation url = ../qtlocation.git branch = 5.8 From 85771ddaaaac19714d93cbca8deb6b73ed25a7fe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 27 Aug 2016 01:39:20 +0300 Subject: [PATCH 16/58] Update submodules on '5.8' in qt5 Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index f37222ce..7cc41b9f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f37222cecb804b154a38b37607b21577de4c5e8c +Subproject commit 7cc41b9f6c18365baee5a2d08221bbd98b706e3c diff --git a/qtbase b/qtbase index 95c767f5..dbeca395 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 95c767f5be3cd42b4ed79eeed6fd4aa6cc29dc16 +Subproject commit dbeca395b8186b8799c5fb9ddff62d78497be7d7 diff --git a/qtcharts b/qtcharts index d43d429e..14447434 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d43d429ea710b1885719b131b2acac42cd955ccb +Subproject commit 144474348803564eaa7bb4d17bd609d146e74f9f diff --git a/qtconnectivity b/qtconnectivity index 77b5b58b..ee177fa9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 77b5b58b182e09b4f9f0c8b0d8b0f907fe8578ae +Subproject commit ee177fa9cdabeca3252907dcbdfba1b28b324c2d diff --git a/qtdeclarative b/qtdeclarative index 8eeede61..830a55ef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8eeede619f417904cbd33fd44143f857dfce0996 +Subproject commit 830a55ef58a21bf342eef1c2544bcbc899014e7b diff --git a/qtlocation b/qtlocation index 6a68408f..832030f2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6a68408fd36eebf32e1131e9e7b6559c4ef9cec4 +Subproject commit 832030f271105a96bdde70b0526df659f21de565 diff --git a/qtmultimedia b/qtmultimedia index cc124467..29232a2b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cc12446728d00161116d6e1823e161440415d2d5 +Subproject commit 29232a2bc207fb7dc44532f64bbe35d9181340c6 diff --git a/qtnetworkauth b/qtnetworkauth index fba638b4..fd00fffd 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit fba638b478e3a37e1287aa088f3aa922070c49d9 +Subproject commit fd00fffd8d306ca3c12a3f793f394dd9169ca969 diff --git a/qtquickcontrols b/qtquickcontrols index 817d6971..df14928f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 817d6971ebf75d0b276a93e1ee15d4826ba76c30 +Subproject commit df14928f12fc04857448a3ab883ffccf199e7c51 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0524ddb9..6d2f05a8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0524ddb9489cd9816fadc330f75efc7b40994013 +Subproject commit 6d2f05a8e283bdc46afac0f3d062bf248559c2b9 diff --git a/qtscxml b/qtscxml index 71087745..a34e5cda 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 71087745a8b34e1d73139df63fbfb9f1bb6b9fcd +Subproject commit a34e5cda67c92021d6999b3544669cdbbd9655f8 diff --git a/qtsensors b/qtsensors index b421290b..0032fd61 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b421290b67507cfe125db206f378fc1b38eaae4e +Subproject commit 0032fd615097baeff2414e352e095bc412000941 diff --git a/qtserialbus b/qtserialbus index e62cf39e..5291efba 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e62cf39e68055f6a39dfab23ecbdb33f9e5ffc77 +Subproject commit 5291efbac552b55d1343040f61908fbf71c29243 diff --git a/qtspeech b/qtspeech index d65fe883..577060af 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d65fe883aaadc95a52dc929cb078320b14d5c4f0 +Subproject commit 577060af2daa198b3607911fd410bb1fa03ae861 diff --git a/qtwayland b/qtwayland index 768a28b2..9610eccd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 768a28b284fa806cba38f864c56ba2e2c37296f2 +Subproject commit 9610eccdf237c5ffc21630cee9c364d0fe871901 diff --git a/qtwebengine b/qtwebengine index eeac120e..6d2e62f3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit eeac120ec135e2ab0bd02f399afb50b684d00298 +Subproject commit 6d2e62f3d67725310ca4ef23603ca7467ed09878 diff --git a/qtwinextras b/qtwinextras index 904b4130..3393a78a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 904b4130be7c4ce2c91ca57864b373938a4ed237 +Subproject commit 3393a78af194e3fe2db61f8b3d018a599270b796 From 70361aac0210a33d1a3dc69ced62ae1e9de50d32 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Aug 2016 07:25:38 +0300 Subject: [PATCH 17/58] Update submodules on '5.8' in qt5 Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 7cc41b9f..446a92c0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7cc41b9f6c18365baee5a2d08221bbd98b706e3c +Subproject commit 446a92c01003df192d01ff562c6088eee66a8b6c diff --git a/qtbase b/qtbase index dbeca395..829c59aa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbeca395b8186b8799c5fb9ddff62d78497be7d7 +Subproject commit 829c59aa4acf94bd979f6a3162808be36802d79a diff --git a/qtdeclarative b/qtdeclarative index 830a55ef..018cd6d7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 830a55ef58a21bf342eef1c2544bcbc899014e7b +Subproject commit 018cd6d70f18762d20cc501ac352fa5f94eb7f66 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6d2f05a8..67f67f2c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6d2f05a8e283bdc46afac0f3d062bf248559c2b9 +Subproject commit 67f67f2cc6de160ddea4aa76afc56e86415ed99b diff --git a/qtwayland b/qtwayland index 9610eccd..b0c416de 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9610eccdf237c5ffc21630cee9c364d0fe871901 +Subproject commit b0c416dede8b6ca596eb2a13361d98613e8c9533 diff --git a/qtwebengine b/qtwebengine index 6d2e62f3..9cda8d43 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6d2e62f3d67725310ca4ef23603ca7467ed09878 +Subproject commit 9cda8d4384825bd93b949f31953548beda165ef8 From 66ffe13b50be44fb99a6ff3f6bc171f21f9735cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Aug 2016 01:01:02 +0300 Subject: [PATCH 18/58] 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 From 5b7def143344e72c6c2f637a2be33b806a327dbe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 31 Aug 2016 17:36:17 +0200 Subject: [PATCH 19/58] Update submodules on '5.8' in qt5 Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 446a92c0..5688464a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 446a92c01003df192d01ff562c6088eee66a8b6c +Subproject commit 5688464a384a6cb1b233bc53a3fa604ae9143dd8 diff --git a/qtbase b/qtbase index 829c59aa..982f17e9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 829c59aa4acf94bd979f6a3162808be36802d79a +Subproject commit 982f17e961500128c9bc849cf5d3ff404b4b4d7c diff --git a/qtdatavis3d b/qtdatavis3d index 43c0bfb2..b6c5569f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 43c0bfb2af436f6b27cdccb156ecac1d1f3711dc +Subproject commit b6c5569f2158e2f211b90bf36ea964fda7bf6ccc diff --git a/qtdeclarative b/qtdeclarative index 018cd6d7..c13aa48d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 018cd6d70f18762d20cc501ac352fa5f94eb7f66 +Subproject commit c13aa48d4cad8659af2b491e4b3ddbe46b38fcc5 diff --git a/qtlocation b/qtlocation index 832030f2..d999495a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 832030f271105a96bdde70b0526df659f21de565 +Subproject commit d999495a01cf6b6cb206a968944b889ab29e3450 diff --git a/qtnetworkauth b/qtnetworkauth index fd00fffd..0cb5de9c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit fd00fffd8d306ca3c12a3f793f394dd9169ca969 +Subproject commit 0cb5de9c28040dd8adeb057fd0ced50cbae715b5 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 df14928f..e516c88c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit df14928f12fc04857448a3ab883ffccf199e7c51 +Subproject commit e516c88c485d17e25a55b63d579fe90f9a529afa diff --git a/qtscxml b/qtscxml index a34e5cda..90b00015 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a34e5cda67c92021d6999b3544669cdbbd9655f8 +Subproject commit 90b000155eea734a4892eec01e24cd69b5efdd16 diff --git a/qtserialbus b/qtserialbus index 5291efba..fa546964 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5291efbac552b55d1343040f61908fbf71c29243 +Subproject commit fa54696446eaed03c2b84ca3e3c0c81ef5d42bea diff --git a/qttools b/qttools index 5b38f448..89d766d6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5b38f4489539eebd93a5fca5cc6de105868faa9d +Subproject commit 89d766d65393a0445ddf5100b7db39f6ba1ed901 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e6e149c6..2d9cb874 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e6e149c6d72c2824d4f9361baf09cea6ef3baa2c +Subproject commit 2d9cb8747c01cec4f4a3a9f22ec320180f705481 diff --git a/qtwebchannel b/qtwebchannel index a5d51e11..bf66a853 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a5d51e11b76d8f6a6276f7e89bf0ccbc2985d474 +Subproject commit bf66a8531e0ada3ade7e873bc3fae824237acd3e diff --git a/qtwebkit b/qtwebkit index f5e23333..5b94fe36 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit f5e23333e851def3a556cb979ca77e6c7a9fb0bf +Subproject commit 5b94fe36c9a35dab849517eab7319376648f7d95 diff --git a/qtwebsockets b/qtwebsockets index ec201d18..94a1fe0b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ec201d18949e4f5af0ab3804ef87aba75fba8f7f +Subproject commit 94a1fe0b12d63fc68e8f8e8670cfe981f67dcbe3 From 68a5a649ab6b2015ffdd30639b7a7f4cf1949154 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Sep 2016 06:59:28 +0300 Subject: [PATCH 20/58] 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 From 64f62b4b95ba3ed13262be47c225db559abdd86f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Sep 2016 02:30:49 +0300 Subject: [PATCH 21/58] 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 From cb6b46a516fd6b862ad72650bd0a6ad3337189c6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Sep 2016 01:00:45 +0300 Subject: [PATCH 22/58] 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 From 72c617cf918fe71ed02225acd56df78f7f6e3e88 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Sep 2016 19:05:10 +0300 Subject: [PATCH 23/58] Update submodules on '5.8' in qt5 Change-Id: Ic507adbb59d9a95afa4c188223f8e0a5d2d5d03c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 5688464a..4bbdcc1f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5688464a384a6cb1b233bc53a3fa604ae9143dd8 +Subproject commit 4bbdcc1fac6b21a6d4607c93a5f8759145248f07 diff --git a/qtbase b/qtbase index 982f17e9..2997a60e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 982f17e961500128c9bc849cf5d3ff404b4b4d7c +Subproject commit 2997a60e1eaf0efbeb22516ae184fa93f278fec5 diff --git a/qtdeclarative b/qtdeclarative index c13aa48d..7a518d85 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c13aa48d4cad8659af2b491e4b3ddbe46b38fcc5 +Subproject commit 7a518d8541c2628073fdbc36945dcacd07da1f07 diff --git a/qtdoc b/qtdoc index cb23e64e..136d584d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cb23e64e8615fef8e43faeba064e4f641b63dca7 +Subproject commit 136d584d59277ffa076f07071bd91c6ce282039d diff --git a/qtmultimedia b/qtmultimedia index 29232a2b..9fb4597d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 29232a2bc207fb7dc44532f64bbe35d9181340c6 +Subproject commit 9fb4597d5c0d3fa3340ae74ed2eb6bb8e3ee2d17 diff --git a/qtnetworkauth b/qtnetworkauth index 0cb5de9c..d25e4dd1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 0cb5de9c28040dd8adeb057fd0ced50cbae715b5 +Subproject commit d25e4dd1b04d66137bb75ca3775b66704a6ad34c diff --git a/qtquickcontrols b/qtquickcontrols index e516c88c..41669ca6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e516c88c485d17e25a55b63d579fe90f9a529afa +Subproject commit 41669ca64f923324ced7c23d0bb027e503437447 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 67f67f2c..82a17dc9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 67f67f2cc6de160ddea4aa76afc56e86415ed99b +Subproject commit 82a17dc90144459982be0ea28145ea8b5e1057a0 diff --git a/qtscxml b/qtscxml index 90b00015..64c9fba6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 90b000155eea734a4892eec01e24cd69b5efdd16 +Subproject commit 64c9fba626f82d7f9e61c5f84a15be4ff01e742b diff --git a/qtserialbus b/qtserialbus index fa546964..5786ec4a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fa54696446eaed03c2b84ca3e3c0c81ef5d42bea +Subproject commit 5786ec4ac183fce74e66439b91497b8da86d7740 diff --git a/qtwebengine b/qtwebengine index 9cda8d43..f5e690bf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9cda8d4384825bd93b949f31953548beda165ef8 +Subproject commit f5e690bff349d48d8493695088bf90025898bf39 From 25ee5c337cdb6f84f44f9643a30ec2a62974d43d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Sep 2016 01:00:58 +0300 Subject: [PATCH 24/58] 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 From 33feec0dc8000d1c02d65bddea29c00e89904c65 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Sep 2016 19:38:54 +0300 Subject: [PATCH 25/58] 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 From 1c06b83ff0df78d7c363d2fe19511661b431a0b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Sep 2016 09:28:13 +0300 Subject: [PATCH 26/58] Update submodules on '5.8' in qt5 Change-Id: I4bd1038cd3ee8cefcfb27179527511c41a0af799 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwinextras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 4bbdcc1f..d5bb02ff 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4bbdcc1fac6b21a6d4607c93a5f8759145248f07 +Subproject commit d5bb02ffe04b9b5ca7d86c8b905b352cc265df32 diff --git a/qtbase b/qtbase index 2997a60e..21b7661a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2997a60e1eaf0efbeb22516ae184fa93f278fec5 +Subproject commit 21b7661a797ecf77fbcad4380e6dcb2ade929a18 diff --git a/qtcanvas3d b/qtcanvas3d index a0408361..acbeb01a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit a04083615e23d4951b20554f421206c5d46d9872 +Subproject commit acbeb01a785582b6654c0bf21b06b6673d269d76 diff --git a/qtcharts b/qtcharts index 14447434..83d5e7fc 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 144474348803564eaa7bb4d17bd609d146e74f9f +Subproject commit 83d5e7fc85cc07fb180498876d1a346573f747e7 diff --git a/qtdeclarative b/qtdeclarative index 7a518d85..9c8fc476 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7a518d8541c2628073fdbc36945dcacd07da1f07 +Subproject commit 9c8fc476c68767895a2c4086cb7f5b99c5fa141f diff --git a/qtmacextras b/qtmacextras index e0e5a574..57b57399 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit e0e5a57430af761192b98292fab73284d351e4f1 +Subproject commit 57b5739923a741aa4317c11c5e86c911cc25f798 diff --git a/qtmultimedia b/qtmultimedia index 9fb4597d..af985a69 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fb4597d5c0d3fa3340ae74ed2eb6bb8e3ee2d17 +Subproject commit af985a697a47cc887625e06c05f5cb785ee66d35 diff --git a/qtnetworkauth b/qtnetworkauth index d25e4dd1..a073103a 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d25e4dd1b04d66137bb75ca3775b66704a6ad34c +Subproject commit a073103a06a08fd053c379ca504d2ceabd413522 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 82a17dc9..86180aed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 82a17dc90144459982be0ea28145ea8b5e1057a0 +Subproject commit 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 diff --git a/qtscxml b/qtscxml index 64c9fba6..23a55352 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 64c9fba626f82d7f9e61c5f84a15be4ff01e742b +Subproject commit 23a55352eb0ada2832fcb5c461ec8f37cd6fc530 diff --git a/qtserialbus b/qtserialbus index 5786ec4a..0e1eb787 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5786ec4ac183fce74e66439b91497b8da86d7740 +Subproject commit 0e1eb787e83423680d161b11cb5167b283075eb3 diff --git a/qttools b/qttools index 89d766d6..608e1856 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 89d766d65393a0445ddf5100b7db39f6ba1ed901 +Subproject commit 608e1856265c5e490f13cb22089bd1d9be4a9bfe diff --git a/qtwayland b/qtwayland index b0c416de..da617397 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b0c416dede8b6ca596eb2a13361d98613e8c9533 +Subproject commit da61739728b2df7981b898da5dbdd4b74be068fc diff --git a/qtwinextras b/qtwinextras index 3393a78a..13604e3f 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3393a78af194e3fe2db61f8b3d018a599270b796 +Subproject commit 13604e3fcc12a536d228f415ce65ca1c86b7015b From f1de674fd9c1d2007982b139c0ade2052efd126a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 2 Sep 2016 15:44:52 +0300 Subject: [PATCH 27/58] 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 + From 25b385764e4a7f4d08ce96ede995f0c7dac67309 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 13 Sep 2016 12:19:30 +0200 Subject: [PATCH 28/58] Add Qt Android Extras as dependency for Qt Purchasing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 743e2e8e..9bcdf4ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -262,7 +262,7 @@ branch = 5.6 status = preview [submodule "qtpurchasing"] - depends = qtbase + depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git From 8cdb619bce8a9611c61e7026332ed4a3607a9130 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Sep 2016 01:00:57 +0300 Subject: [PATCH 29/58] Update submodules on '5.6' in qt5 Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bd9f3c50..3370ab91 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd9f3c50df9ad782b49eb47edf6264f8c4e8ac74 +Subproject commit 3370ab9119df09ca14f7d4641c555e60c1b3f478 diff --git a/qtdeclarative b/qtdeclarative index 03e64ff6..82176ad2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 03e64ff6e60ebb2c0ea1b9f408d82367e68b6514 +Subproject commit 82176ad2090b236e3255a8b4ae26557e4bc932c0 diff --git a/qtquickcontrols b/qtquickcontrols index ffcdd1d6..3aee127f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ffcdd1d6742986e46920919800a382ecf7b58011 +Subproject commit 3aee127f969cabec0819d93d305d47afc4cf25d6 diff --git a/qtsvg b/qtsvg index 1ffd91a8..78bc4273 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1ffd91a8a0c7ddb901b3c91f0f5e475811994e59 +Subproject commit 78bc427395116bfaf3d99134f42aec5310020f8e diff --git a/qtwebengine b/qtwebengine index 44f41d30..ce2f1b14 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 44f41d30ed3efce2f1970dcd158555b41b38014d +Subproject commit ce2f1b140d2d417f925ec54c8a095981827f7e68 diff --git a/qtwebview b/qtwebview index aad32ba9..79351892 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 +Subproject commit 793518927073fe101149acdc6ba672c40c565027 From 90f5a25c661f6652cc83df58e8adb9ff6875f6ab Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 13 Sep 2016 19:30:02 +0300 Subject: [PATCH 30/58] Update Ruby on Win10 QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann --- coin/provisioning/common/helpers.ps1 | 20 +++++++++++++++++++ coin/provisioning/common/ruby.ps1 | 7 +++++++ .../provisioning/qtci-windows-10-x86/ruby.ps1 | 1 + .../qtci-windows-10-x86_64/ruby.ps1 | 1 + 4 files changed, 29 insertions(+) create mode 100644 coin/provisioning/common/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d7b957f3..055ce0a7 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -29,3 +29,23 @@ function Extract-Zip $destinationFolder = $shell.Namespace($Destination) $destinationFolder.CopyHere($zipfile.Items(), 16) } + +function BadParam +{ + Param ([string]$Description) + throw("You must specify $Description") +} + +function Download +{ + Param ( + [string] $OfficialUrl = $(BadParam("the official download URL")), + [string] $CachedUrl = $(BadParam("the locally cached URL")), + [string] $Destination = $(BadParam("a download target location")) + ) + try { + Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination + } catch { + Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination + } +} diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 new file mode 100644 index 00000000..343bacfc --- /dev/null +++ b/coin/provisioning/common/ruby.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" + +Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer +Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" +& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" From 99ff42545f4f3935858908278adf74cd02a91058 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 13 Sep 2016 19:35:38 +0300 Subject: [PATCH 31/58] Install Conan on Win10 QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 7 +++++++ coin/provisioning/qtci-windows-10-x86/conan.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 1 + 3 files changed, 9 insertions(+) create mode 100644 coin/provisioning/common/conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/conan.ps1 diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 new file mode 100644 index 00000000..4b4e0726 --- /dev/null +++ b/coin/provisioning/common/conan.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" + +Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer +Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" +& $installer /DIR=C:\Utils\Conan /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 new file mode 100644 index 00000000..6a91fce2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\conan.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 new file mode 100644 index 00000000..6a91fce2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\conan.ps1" From b6414f7d0880badf36ac95a639292b08ab2392f8 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 12 Sep 2016 18:13:54 +0300 Subject: [PATCH 32/58] Added conanfiles for qtwebkit Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 4 ++++ .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt create mode 100644 coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..f1d31a18 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -0,0 +1,4 @@ +[requires] +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..f1d31a18 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -0,0 +1,4 @@ +[requires] +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable From 78a764ee65b1b380b73e1800bfeda54598aa4c8b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 14 Sep 2016 15:57:48 +0300 Subject: [PATCH 33/58] Install conan dependencies if there is conanfile.txt for module Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 26 +++++++++++++++++++ .../qtci-windows-10-x86/conan.ps1 | 7 +++++ .../qtci-windows-10-x86_64/conan.ps1 | 7 +++++ 3 files changed, 40 insertions(+) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 4b4e0726..355e0f18 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -5,3 +5,29 @@ $installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT + +function Run-Conan-Install +{ + Param ( + [string]$ConanfilesDir, + [string]$BuildinfoDir, + [string]$Arch, + [string]$Compiler, + [string]$CompilerVersion + ) + + Get-ChildItem -Path "$ConanfilesDir\*.txt" | + ForEach-Object { + $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + New-Item $outpwd -Type directory -Force + Start-Process ` + "C:\Utils\Conan\conan\conan.exe" ` + -WorkingDirectory $outpwd ` + -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` + -NoNewWindow -Wait + } + + [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") +} diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index 6a91fce2..dc299e7b 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -1 +1,8 @@ . "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir msvc-2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 6a91fce2..8c979776 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -1 +1,8 @@ . "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir msvc-2015-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 From 64cc947ded9999527197168f5d16f25a15638e58 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 25 Aug 2016 17:19:08 +0200 Subject: [PATCH 34/58] automatically launch new configure system in top-level builds this includes moving the -skip option here, where it belongs. the implementation is a bit hacky, but the proper one would be vastly more complex: we'd have to load all modules, then parse the command line properly (the -skip parsing would be a custom callback, to avoid needing to process features), then discard all now excluded modules again, then re-process the command line (so we can complain about options which are now invalid), and only now proceed with the actual feature processing. that seems a bit over the top, so we accept that -skip cannot be the argument of another option, which seems quite reasonable. Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298 Reviewed-by: Jake Petroules Reviewed-by: Frederik Gladhorn --- configure.json | 7 +++++++ qt.pro | 31 +++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 configure.json diff --git a/configure.json b/configure.json new file mode 100644 index 00000000..f437252f --- /dev/null +++ b/configure.json @@ -0,0 +1,7 @@ +{ + "commandline": { + "options": { + "skip": "addString" + } + } +} diff --git a/qt.pro b/qt.pro index f8d3d4d3..1915fc2c 100644 --- a/qt.pro +++ b/qt.pro @@ -1,12 +1,10 @@ # Create the super cache so modules will add themselves to it. cache(, super) -CONFIG += build_pass # hack to disable the .qmake.super auto-add -load(qt_build_config) -CONFIG -= build_pass # unhack, as it confuses Qt Creator - TEMPLATE = subdirs +CONFIG += prepare_docs qt_docs_targets + # Extract submodules from .gitmodules. lines = $$cat(.gitmodules, lines) for (line, lines) { @@ -26,6 +24,29 @@ for (line, lines) { } QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules +QT_SKIP_MODULES = +uikit { + QT_SKIP_MODULES += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples + !ios: QT_SKIP_MODULES += qtscript +} + +# This is a bit hacky, but a proper implementation is not worth it. +args = $$QMAKE_EXTRA_ARGS +for (ever) { + isEmpty(args): break() + a = $$take_first(args) + + equals(a, -skip) { + isEmpty(args): break() + m = $$take_first(args) + contains(m, -.*): next() + m ~= s/^(qt)?/qt/ + !contains(modules, $$m): \ + error("-skip command line argument used with non-existent module '$$m'.") + QT_SKIP_MODULES += $$m + } +} + modules = $$sort_depends(modules, module., .depends .recommends) modules = $$reverse(modules) for (mod, modules) { @@ -72,3 +93,5 @@ for (mod, modules) { SUBDIRS += $$mod } + +load(qt_configure) From 387e428e9ad0459a5fc27c26e8bcb5b891a48bf4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Sep 2016 11:28:07 +0300 Subject: [PATCH 35/58] Update submodules on '5.8' in qt5 Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index d5bb02ff..364f5303 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d5bb02ffe04b9b5ca7d86c8b905b352cc265df32 +Subproject commit 364f53038e4a24837bdc53255468832a8def1431 diff --git a/qtandroidextras b/qtandroidextras index c944c05c..01246d44 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c944c05ca4e4d42b6b11721ddc763f1525d6fcfa +Subproject commit 01246d44d9251f3cb0d5a81f06de88606fc3db12 diff --git a/qtbase b/qtbase index 21b7661a..fc098de7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 21b7661a797ecf77fbcad4380e6dcb2ade929a18 +Subproject commit fc098de70a5dda5f45ebe238a43f24f674426f3d diff --git a/qtcanvas3d b/qtcanvas3d index acbeb01a..179fdc13 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit acbeb01a785582b6654c0bf21b06b6673d269d76 +Subproject commit 179fdc13c95198053c355182dae34fc554de320d diff --git a/qtdeclarative b/qtdeclarative index 9c8fc476..89314016 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9c8fc476c68767895a2c4086cb7f5b99c5fa141f +Subproject commit 893140169557eb06d79e783d38673217deab28c1 diff --git a/qtnetworkauth b/qtnetworkauth index a073103a..28a2294d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a073103a06a08fd053c379ca504d2ceabd413522 +Subproject commit 28a2294df4e0e46286761a0ba101867e3106125b diff --git a/qtpurchasing b/qtpurchasing index 4aa95af0..ccdf4106 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4aa95af07083abe28d61143379427f4418dcf678 +Subproject commit ccdf4106314a0a088ab95f117b55e0a39d1d2e09 diff --git a/qtquickcontrols b/qtquickcontrols index 41669ca6..94c511b6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 41669ca64f923324ced7c23d0bb027e503437447 +Subproject commit 94c511b63af10a5507936ab7fbdd517144cde872 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 86180aed..a3e2bf8d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 +Subproject commit a3e2bf8d0c5baffc5676edd662451cc42e44a93a diff --git a/qtscxml b/qtscxml index 23a55352..abd6d0c9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 23a55352eb0ada2832fcb5c461ec8f37cd6fc530 +Subproject commit abd6d0c93bdbe24b78dc26212d4d586425a50706 diff --git a/qtserialbus b/qtserialbus index 0e1eb787..2b756dd5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0e1eb787e83423680d161b11cb5167b283075eb3 +Subproject commit 2b756dd5492c8fdd8fd37504b48109798ab7a96d diff --git a/qtspeech b/qtspeech index 577060af..7e2f56ec 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 577060af2daa198b3607911fd410bb1fa03ae861 +Subproject commit 7e2f56ece3fa631827668bf636a1691af597f411 diff --git a/qtsvg b/qtsvg index 4c44cffd..96d6354c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4c44cffd7b376900fc41169365ae03c7c65d95b6 +Subproject commit 96d6354cf7e13797ab419ca9e74b89dd33f68ffe diff --git a/qtwayland b/qtwayland index da617397..004c6ffd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit da61739728b2df7981b898da5dbdd4b74be068fc +Subproject commit 004c6ffdbdb91f215364740a1975b37fe54b757c diff --git a/qtwebengine b/qtwebengine index f5e690bf..a6e29d8c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f5e690bff349d48d8493695088bf90025898bf39 +Subproject commit a6e29d8c3ea8a3f2530761f5db1ae1f620655d6a diff --git a/qtwebsockets b/qtwebsockets index 94a1fe0b..ccb13854 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 94a1fe0b12d63fc68e8f8e8670cfe981f67dcbe3 +Subproject commit ccb138548314a767a897496c74c04a261a391027 diff --git a/qtwebview b/qtwebview index c4031710..67580ae6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c4031710944db746bc5787120ec0bccb2e71b96c +Subproject commit 67580ae6e2f75d93aae1e3412bf9c042b2992320 diff --git a/qtx11extras b/qtx11extras index 6143e155..448211f0 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 6143e155ad1370f97a24b5ea965c753887082074 +Subproject commit 448211f022507c6e7787e47aca4b3f12e3f12d94 From b5944e9485f5389151b29a126104787a15866130 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 24 Aug 2016 16:04:41 +0200 Subject: [PATCH 36/58] Make sure to install gtk 3 and gstreamer on RHEL 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51 Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh new file mode 100644 index 00000000..fcee4305 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh @@ -0,0 +1,7 @@ +# gstreamer 1 for QtMultimedia +# gtk3 style for QtGui/QStyle + +sudo yum install -y \ + gstreamer1-devel gstreamer1-plugins-base-devel \ + gtk3-devel + From 0958cc4ccaf874bce926e96de6287622766a7978 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 13:54:06 +0300 Subject: [PATCH 37/58] Changed BuildinfoDir of conan to use Coin-compatible compiler name Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index dc299e7b..a30be8d4 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86 ` + -BuildinfoDir MSVC2015-X86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 8c979776..759a251d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86_64 ` + -BuildinfoDir MSVC2015-X86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14 From fd6fe04cad632edc4e127038c5312cbe5ce6a17b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:00:28 +0300 Subject: [PATCH 38/58] Added cmake_installer, imports and explicit library types to conanfiles Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann --- .../qtci-windows-10-x86/conanfiles/qtwebkit.txt | 15 +++++++++++++++ .../conanfiles/qtwebkit.txt | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin From e1bfa77391fcf3d50f0d9f9375f5d123710395cf Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:18:46 +0300 Subject: [PATCH 39/58] Do not use qmake and cmake generator automatically for each conanfile Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 1 + .../provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 355e0f18..117cdfc6 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -23,7 +23,7 @@ function Run-Conan-Install Start-Process ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` - -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + -ArgumentList "install -i -f $($_.FullName)", ` '-s', ('compiler="' + $Compiler + '"'), ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 8e0447d0..d1fcbfba 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable [generators] +cmake virtualenv [options] diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 8e0447d0..d1fcbfba 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable [generators] +cmake virtualenv [options] From 23d11128396da8362f27d703287600699b5a962c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 17 Sep 2016 21:04:03 +0300 Subject: [PATCH 40/58] Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 117cdfc6..6d7cf07b 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") + function Run-Conan-Install { Param ( @@ -28,6 +30,4 @@ function Run-Conan-Install "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait } - - [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") } diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index a30be8d4..718d25de 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86 ` + -BuildinfoDir MSVC2015-x86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 759a251d..04887712 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86_64 ` + -BuildinfoDir MSVC2015-x86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14 From 6a8a0abf9ecb4e0fa15c71ee88837f9c0677a07f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Sep 2016 23:51:23 +0300 Subject: [PATCH 41/58] Update submodules on '5.6' in qt5 Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 1de9d68b..c3b34277 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1de9d68b2631de9432ab9929bb4b917604cc7be7 +Subproject commit c3b34277bc7b602185b2f4eccd19af270aa6b09d diff --git a/qtbase b/qtbase index 3370ab91..6b9c57f8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3370ab9119df09ca14f7d4641c555e60c1b3f478 +Subproject commit 6b9c57f8cd3df65702db327616913fa9d8172237 diff --git a/qtcanvas3d b/qtcanvas3d index 2778071f..6b6bda4c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2778071f6c80b5397a183db37114aef881ade855 +Subproject commit 6b6bda4c7fc419112386ca9b4fe89d092bf14cc5 diff --git a/qtconnectivity b/qtconnectivity index fc3c1d9e..9dba73f3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fc3c1d9e3b330b49d0442252966e6682ff0e2488 +Subproject commit 9dba73f30505ed7c220055788fba3cd201848fdb diff --git a/qtdeclarative b/qtdeclarative index 82176ad2..a273a0ad 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 82176ad2090b236e3255a8b4ae26557e4bc932c0 +Subproject commit a273a0ad9c1df7aed612ee6353753f668d545076 diff --git a/qtdoc b/qtdoc index aebe202e..ea17b457 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aebe202ec85d3a8a04772713786ffab838101934 +Subproject commit ea17b457b3b019685b5b72744aeaf3c5c2b7d53e diff --git a/qtlocation b/qtlocation index 7504b2ce..7cfd70fa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 +Subproject commit 7cfd70fa2f8fd24053d31122ac0a27eb56915895 diff --git a/qtmultimedia b/qtmultimedia index a8fe4b98..e535480e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a8fe4b989b2002d3fcb4e33afe16bd6fd2ff192b +Subproject commit e535480e13c2ba0483f4a25be90c5db82529c25c diff --git a/qtquickcontrols b/qtquickcontrols index 3aee127f..c2356328 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3aee127f969cabec0819d93d305d47afc4cf25d6 +Subproject commit c2356328f88b044c8956fe7860c4c04fca4f2c30 diff --git a/qtscript b/qtscript index 9dc78a2d..b4eb16b7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9dc78a2d847bca5ec7b1445356523383a030d7ce +Subproject commit b4eb16b7ffd7d281610765eab4332036d7d8f81c diff --git a/qtsensors b/qtsensors index 46d9a630..72400841 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 +Subproject commit 724008411c16aaf8fa25c09745e20d0d47d65721 diff --git a/qtserialbus b/qtserialbus index c8305c87..3dfc46f0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 +Subproject commit 3dfc46f069f3287c411ab178513d0ad47bf95352 diff --git a/qtserialport b/qtserialport index b0e3e746..dd179422 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0e3e7469cf5249bb395d044c5344bbe88884553 +Subproject commit dd17942259cf0cbe834f504128d522c93020ea84 diff --git a/qttools b/qttools index 1285db5b..316720b4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1285db5b12c6041a5d1c55d07113ce75a9d76e3a +Subproject commit 316720b417a8360d2dfa24e9f3924fc46ef590e3 diff --git a/qtwayland b/qtwayland index a96dec76..90123a9f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a96dec760b19c85c67fb0cca649c22a12e7f51f5 +Subproject commit 90123a9f30ee1173c9d64e415fc9b6e27a4227fc diff --git a/qtwebengine b/qtwebengine index ce2f1b14..9c0bd920 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ce2f1b140d2d417f925ec54c8a095981827f7e68 +Subproject commit 9c0bd9207560e36e7bad3657e02305aabd7638b9 diff --git a/qtwebkit b/qtwebkit index bb43bca1..7be99344 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bb43bca1664721401c3a2c25b585913bb5e8cb4f +Subproject commit 7be993442fac143ef7b13515b70f0ebacaca2935 diff --git a/qtwebview b/qtwebview index 79351892..16887a02 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 793518927073fe101149acdc6ba672c40c565027 +Subproject commit 16887a0294346edcdf0a912a69e2da892e4fd0e8 diff --git a/qtwinextras b/qtwinextras index 75385854..9ca1e678 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 75385854e5973b28d13055d8896cb00380951466 +Subproject commit 9ca1e678976d06d23b236011a3a55a025a272320 From 2d61b0871d3ceb9ed23dfd18375febc7dc78f5e8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Sep 2016 18:14:39 +0300 Subject: [PATCH 42/58] Update submodules on '5.8' in qt5 Change-Id: Ic49edc7055336d6717fdd985798f665db3803384 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qt3d b/qt3d index 364f5303..52121396 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 364f53038e4a24837bdc53255468832a8def1431 +Subproject commit 52121396c55e6100316f006c87b4fdaa8b5a0719 diff --git a/qtactiveqt b/qtactiveqt index 45cd9f66..46454bd6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 45cd9f66f42c595ff429475170b6e623669363a6 +Subproject commit 46454bd6e0892ab6a9ac971a454f24b1f2535f14 diff --git a/qtandroidextras b/qtandroidextras index 01246d44..8bd0a0e5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 01246d44d9251f3cb0d5a81f06de88606fc3db12 +Subproject commit 8bd0a0e5215227c5e56966fead0987e306eaccb8 diff --git a/qtbase b/qtbase index fc098de7..e395e791 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc098de70a5dda5f45ebe238a43f24f674426f3d +Subproject commit e395e79145ff861b2dd87e404d229d769a19ab7e diff --git a/qtcanvas3d b/qtcanvas3d index 179fdc13..6c5121ea 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 179fdc13c95198053c355182dae34fc554de320d +Subproject commit 6c5121eab75e61f807c2df0f14988317f220b945 diff --git a/qtcharts b/qtcharts index 83d5e7fc..6e224c11 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 83d5e7fc85cc07fb180498876d1a346573f747e7 +Subproject commit 6e224c11080feef2c6d7857d061a92e320e50899 diff --git a/qtconnectivity b/qtconnectivity index ee177fa9..9d22c12f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ee177fa9cdabeca3252907dcbdfba1b28b324c2d +Subproject commit 9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045 diff --git a/qtdeclarative b/qtdeclarative index 89314016..16914894 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 893140169557eb06d79e783d38673217deab28c1 +Subproject commit 16914894f035963ace51c92de13aad11a53c3cf8 diff --git a/qtdoc b/qtdoc index 136d584d..3ff9798f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 136d584d59277ffa076f07071bd91c6ce282039d +Subproject commit 3ff9798f3fccf3c4754e3991a787c9ebf65e23b4 diff --git a/qtgamepad b/qtgamepad index f4bd1e26..e10ce3bf 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit f4bd1e26876c5e2ebf5e39b0f087b232b1dd875a +Subproject commit e10ce3bfa5ed2290c9d210509bad3238d9bec8bc diff --git a/qtimageformats b/qtimageformats index d3ac5245..7795bb6c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d3ac5245d024d78b1366839174fca557778ded98 +Subproject commit 7795bb6c194692abbca31a9734c83a78362c8063 diff --git a/qtlocation b/qtlocation index d999495a..66a6bd9f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d999495a01cf6b6cb206a968944b889ab29e3450 +Subproject commit 66a6bd9fb20e76ab288e4eef59d06c06a411a471 diff --git a/qtmultimedia b/qtmultimedia index af985a69..01c9322b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit af985a697a47cc887625e06c05f5cb785ee66d35 +Subproject commit 01c9322bfe918b886468eb520d77b21b6d8c0c11 diff --git a/qtnetworkauth b/qtnetworkauth index 28a2294d..ab389a56 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 28a2294df4e0e46286761a0ba101867e3106125b +Subproject commit ab389a568e0c088d4e5ced024ec2782439d8b2fe diff --git a/qtpurchasing b/qtpurchasing index ccdf4106..b084f29a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ccdf4106314a0a088ab95f117b55e0a39d1d2e09 +Subproject commit b084f29aa1f82c639c7b817658d66e05bfbff8b2 diff --git a/qtquickcontrols b/qtquickcontrols index 94c511b6..3b093789 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 94c511b63af10a5507936ab7fbdd517144cde872 +Subproject commit 3b093789b07c670e29d3275e26c4e7122db042ae diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a3e2bf8d..c5a44092 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a3e2bf8d0c5baffc5676edd662451cc42e44a93a +Subproject commit c5a44092c8b73c540862c4a160c31487a8518992 diff --git a/qtscript b/qtscript index 059fc10f..52f416f7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 059fc10f8f70a65265a27c354322099806d23d7e +Subproject commit 52f416f7889c2e63b901eeca07f2c5bda7b27b93 diff --git a/qtscxml b/qtscxml index abd6d0c9..4ca72f44 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit abd6d0c93bdbe24b78dc26212d4d586425a50706 +Subproject commit 4ca72f4448d3a0a9b686fac20e0d427dc77305aa diff --git a/qtsensors b/qtsensors index 0032fd61..df3374bd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0032fd615097baeff2414e352e095bc412000941 +Subproject commit df3374bd4bb8af1494f6a35b1102f15cfe9633e0 diff --git a/qtserialbus b/qtserialbus index 2b756dd5..7845b1c5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 2b756dd5492c8fdd8fd37504b48109798ab7a96d +Subproject commit 7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f diff --git a/qtserialport b/qtserialport index df8d69c0..0e79f14e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit df8d69c000c0a91101aa40f2f66b11a694745392 +Subproject commit 0e79f14e56eb43abcb903d5ece41221f6032ef26 diff --git a/qtspeech b/qtspeech index 7e2f56ec..59a27926 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7e2f56ece3fa631827668bf636a1691af597f411 +Subproject commit 59a279265f8f586f83b172c327af8865d4263317 diff --git a/qtsvg b/qtsvg index 96d6354c..5a00abde 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 96d6354cf7e13797ab419ca9e74b89dd33f68ffe +Subproject commit 5a00abdefd1c050aae8760dfc01ae5e3631077aa diff --git a/qttools b/qttools index 608e1856..ea6e06c5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 608e1856265c5e490f13cb22089bd1d9be4a9bfe +Subproject commit ea6e06c59e901a5b1fc98bc82d15ba9b85e9faf7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2d9cb874..78fa7c11 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2d9cb8747c01cec4f4a3a9f22ec320180f705481 +Subproject commit 78fa7c11ea79067d819bbcbaa903086eae929015 diff --git a/qtwayland b/qtwayland index 004c6ffd..5f256690 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 004c6ffdbdb91f215364740a1975b37fe54b757c +Subproject commit 5f256690a1e953ed456988b83daf43139b828131 diff --git a/qtwebengine b/qtwebengine index a6e29d8c..6106d6b0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a6e29d8c3ea8a3f2530761f5db1ae1f620655d6a +Subproject commit 6106d6b0b3833e63aeb568f37a47fc6adca8fdb9 diff --git a/qtwebkit b/qtwebkit index 5b94fe36..6c536617 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5b94fe36c9a35dab849517eab7319376648f7d95 +Subproject commit 6c536617acb53b03be44bcb84767eb2bf35a16a2 diff --git a/qtxmlpatterns b/qtxmlpatterns index 0171940a..dba42c92 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0171940a5395bdffc2ce696a6f75a5b97cd27c5b +Subproject commit dba42c925db368aa958c38c6a3481f18a57bd71f From 891afe7066a0791f2a8f861c55328af4e3a0ddd3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 19 Sep 2016 02:30:49 +0300 Subject: [PATCH 43/58] Update submodules on '5.7' in qt5 Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index 88ca1827..73e1f94e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 88ca1827cf6532b0e8d4fbacb4bc87a515c2cff4 +Subproject commit 73e1f94e557709a3c4d59eb94314701319c3c1d8 diff --git a/qtactiveqt b/qtactiveqt index 5508cd19..4329879b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5508cd19d17c2b2a94aef94be2b4dcdbb29377e8 +Subproject commit 4329879b4d73936fe757591f19cb2a86cae1d6b7 diff --git a/qtbase b/qtbase index cf88d744..8d64d1e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cf88d74466cd6506875676ef2557c179d72fe422 +Subproject commit 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 diff --git a/qtcanvas3d b/qtcanvas3d index 269b1d56..8e34d6f5 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 269b1d5699f6c95d46553e7ee547f1c4b7545e63 +Subproject commit 8e34d6f5399a29d45f9402219f13b631e29fd4b0 diff --git a/qtcharts b/qtcharts index bf26aa9d..a64d9547 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit bf26aa9d15e525fdcf6fd3f59268418533f06790 +Subproject commit a64d954717a4b7fecc8eeea001e4a77483985132 diff --git a/qtconnectivity b/qtconnectivity index ecc2ca9e..aabce3a0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ecc2ca9e9e6b98e8da7c7d223cfa5eb5257591d6 +Subproject commit aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 diff --git a/qtdeclarative b/qtdeclarative index 48dce247..345226aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 48dce24717ca537a6f5d817b2f5cd689df86ad68 +Subproject commit 345226aa3ecee8642c3bf46e40c981d4a49d958e diff --git a/qtimageformats b/qtimageformats index ca1370e2..11300c62 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ca1370e27a4f86771809b4499da9dc61807ba03e +Subproject commit 11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e diff --git a/qtlocation b/qtlocation index c78af343..5d048160 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c78af3434956645b68dd13ab6b8a945239c5782c +Subproject commit 5d0481603414a4584dbfe89aaba48a6135b9e2d8 diff --git a/qtmacextras b/qtmacextras index f3d6e8ee..237ad2f2 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f3d6e8eed740aff58891827e0061d213a7e512cb +Subproject commit 237ad2f2f0850a35aec92776b968db3965d352c9 diff --git a/qtmultimedia b/qtmultimedia index da7d462e..256ee311 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit da7d462e315fb101fc9112a294b5ca2e3bd35a75 +Subproject commit 256ee311b936d69561e97f7f8ee832cff93cb509 diff --git a/qtpurchasing b/qtpurchasing index dc6d9e0e..e8433841 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dc6d9e0ef119d2d4337c6366669220443e553e6f +Subproject commit e843384150e7b3cad3e837d611c50f6db4d85942 diff --git a/qtquickcontrols b/qtquickcontrols index abe319c9..d9aae9ff 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit abe319c9cb811832bb4c9c95290564dfa7b3603a +Subproject commit d9aae9ff99d20b58487b0a48801864d13115363b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9ae57848..ffdb00d9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9ae57848671419b2622e254af8642fef7b1b7c33 +Subproject commit ffdb00d903ca343ac08ffb44535956d6fad9ae49 diff --git a/qtscript b/qtscript index 52873703..42f94f30 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 52873703412bce5d295a1351d32b0f72fb4bedd9 +Subproject commit 42f94f30488a01751f387dc9bd3160ce1b4dfa58 diff --git a/qtsensors b/qtsensors index beac0b2e..ecd018fe 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit beac0b2e3ea4b292f0473c00bcf68d75360f89ef +Subproject commit ecd018fe2ee4508e094f631d882ecc1360abec01 diff --git a/qtserialbus b/qtserialbus index 398eda8b..e13f9fe6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 398eda8be9eb3415ca44cc35dad3422311d8e221 +Subproject commit e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a diff --git a/qtserialport b/qtserialport index 10967b14..a840a9ea 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 10967b1443720116744ecfc42fe442681d149c5a +Subproject commit a840a9ea5548044c1901f5d4008aaa00553f99d7 diff --git a/qtsvg b/qtsvg index 4469fbec..d3d3db5a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4469fbecd4e004979dada2da72573c06719fee3c +Subproject commit d3d3db5a75fe2ba992742e418bfefa25eddf7684 diff --git a/qttools b/qttools index 781efbab..d974321a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 781efbabf32e4438ae9c698ce498cc32cc900c57 +Subproject commit d974321ae490f15f987bc587819a5536fdcf4a8f diff --git a/qttranslations b/qttranslations index 38d6c3fe..19b6455c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 38d6c3fe848487970640068ec12fc0c87a2938ee +Subproject commit 19b6455cbde56b340ec406f7b5bfdeb1c72c656a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index ad1da1a8..5ac6b611 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit ad1da1a8c3be6ec804f3965b47d0762654f81731 +Subproject commit 5ac6b611b196c66bc8b01c23aa50d175ae7a7308 diff --git a/qtwayland b/qtwayland index 2f83f449..fcaa38c8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2f83f4490b6c644bb02fa6bf9d88e87492418723 +Subproject commit fcaa38c84dc92ec951c43e1759d7a46080755cbc diff --git a/qtwebengine b/qtwebengine index 3cc14885..099ffa62 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3cc148853f0f7468526df9dd2397a70a8eeeedae +Subproject commit 099ffa623920355f3a70402ddfa49dd1a3ecb2f0 diff --git a/qtwebkit b/qtwebkit index 01676ca2..4671ed5b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 01676ca2ffb25adfe331a3b50792ac99687d5319 +Subproject commit 4671ed5b9df8f8edd3856b24bab93d7246f700f5 diff --git a/qtwebsockets b/qtwebsockets index 38d830d0..6bef834d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 38d830d00fc2f8c196d736094448e55623e4b35e +Subproject commit 6bef834d17ea9978b99e309eb396e10c8b9fba4c diff --git a/qtwebview b/qtwebview index 08cb6659..3223c849 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 08cb6659a4bfd441760c26ab7f405c439c7d6ca3 +Subproject commit 3223c849260d231cb1dd06c69ef65f28f3347e3f diff --git a/qtwinextras b/qtwinextras index 93a998f5..0b705525 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 93a998f5ef31f7d9f8dd72909c4342db84cc1b59 +Subproject commit 0b70552561919630f7a16b20bf1b1eec0e2ac8cb diff --git a/qtxmlpatterns b/qtxmlpatterns index 332ef472..89dbcc4f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 332ef472a9597822cd29da143f27c8e4083af621 +Subproject commit 89dbcc4f807015736a8ce3393b857735019d098d From 05369586148955fbba0df6e3adba6c9c7996dd5d Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 21 Sep 2016 09:14:18 +0300 Subject: [PATCH 44/58] Provision libusb-1.0 for Linux It is a dependency of tqtc-boot2qt/qdb, which will join CI soon. Change-Id: I3b205877e705f554202ab7171f9d828491b95ac6 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh | 4 +++- coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh new file mode 100644 index 00000000..229e259f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh @@ -0,0 +1,3 @@ +#!/bin/env bash +# Required for tqtc-boot2qt/qdb +sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh index fcee4305..c322bcbf 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh @@ -1,7 +1,9 @@ # gstreamer 1 for QtMultimedia # gtk3 style for QtGui/QStyle +# libusb1 for tqtc-boot2qt/qdb sudo yum install -y \ gstreamer1-devel gstreamer1-plugins-base-devel \ - gtk3-devel + gtk3-devel \ + libusb1-devel diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh new file mode 100644 index 00000000..f48a6e36 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh @@ -0,0 +1,3 @@ +#!/bin/env bash +# Required for tqtc-boot2qt/qdb +sudo apt-get install -y libusb-1.0-0-dev From cb480a386059a4f9f4203bbd252f67c4f2016f2d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 21 Sep 2016 23:56:41 +0300 Subject: [PATCH 45/58] Update submodules on '5.8' in qt5 Change-Id: Ic9386ba7ad3b9a28180719440af6eeb64f4483ff Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtpurchasing | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 46454bd6..21fa3e04 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 46454bd6e0892ab6a9ac971a454f24b1f2535f14 +Subproject commit 21fa3e04b0febc0fa0a84d01eacd3831fd6628f8 diff --git a/qtbase b/qtbase index e395e791..7555a925 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e395e79145ff861b2dd87e404d229d769a19ab7e +Subproject commit 7555a925816e3244073803f0adc4d44640f5ac1d diff --git a/qtconnectivity b/qtconnectivity index 9d22c12f..d6fd07c9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045 +Subproject commit d6fd07c9260f5a1411f8e6468182f1096344b146 diff --git a/qtdeclarative b/qtdeclarative index 16914894..58e6b10a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 16914894f035963ace51c92de13aad11a53c3cf8 +Subproject commit 58e6b10a58e3d9b9bc5393819163af5afa734320 diff --git a/qtdoc b/qtdoc index 3ff9798f..334cb51e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3ff9798f3fccf3c4754e3991a787c9ebf65e23b4 +Subproject commit 334cb51e0d499cd2c60720744365681aaa370676 diff --git a/qtlocation b/qtlocation index 66a6bd9f..6eeda17e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 66a6bd9fb20e76ab288e4eef59d06c06a411a471 +Subproject commit 6eeda17e1e23b785b94592f8192c65c9c3b9d919 diff --git a/qtpurchasing b/qtpurchasing index b084f29a..9aa3e78f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit b084f29aa1f82c639c7b817658d66e05bfbff8b2 +Subproject commit 9aa3e78fd1cc5ceceea6ccc647a04707c9260c23 diff --git a/qtscxml b/qtscxml index 4ca72f44..c217e28d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4ca72f4448d3a0a9b686fac20e0d427dc77305aa +Subproject commit c217e28d44b135e459da50c4c7e8ad8bdf51b579 diff --git a/qtserialbus b/qtserialbus index 7845b1c5..620e1594 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f +Subproject commit 620e1594cb530e286169b2f5a6b1544fa79c594a diff --git a/qtwayland b/qtwayland index 5f256690..3f5111b6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5f256690a1e953ed456988b83daf43139b828131 +Subproject commit 3f5111b6c1d92ae4fed008abb53cf4226bfef575 diff --git a/qtwebengine b/qtwebengine index 6106d6b0..001ee1d6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6106d6b0b3833e63aeb568f37a47fc6adca8fdb9 +Subproject commit 001ee1d6da4bf6769d702810f8ebcb05978663cc diff --git a/qtxmlpatterns b/qtxmlpatterns index dba42c92..21cc71ce 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit dba42c925db368aa958c38c6a3481f18a57bd71f +Subproject commit 21cc71ced3565585f7a2f94875ed845355ab2064 From 7c6a3f423a84cfdd96ae1734f7daf64af5577d07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Sep 2016 02:30:54 +0300 Subject: [PATCH 46/58] Update submodules on '5.7' in qt5 Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 73e1f94e..7e638edb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 73e1f94e557709a3c4d59eb94314701319c3c1d8 +Subproject commit 7e638edbd15640302516f9a69d20f62d26d4af06 diff --git a/qtdoc b/qtdoc index 02bf1659..c7ecd300 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02bf1659f701d222ad3f95f82f13948a75635e79 +Subproject commit c7ecd300ab0c0cb7a9bafedab2ef792cdfa4d25d diff --git a/qtlocation b/qtlocation index 5d048160..42372ce4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5d0481603414a4584dbfe89aaba48a6135b9e2d8 +Subproject commit 42372ce4c4114f7e38fc5ac681e9199869b4619f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ffdb00d9..85230f22 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ffdb00d903ca343ac08ffb44535956d6fad9ae49 +Subproject commit 85230f227f38d56572ad4650dda9fcce3942f86d diff --git a/qtserialport b/qtserialport index a840a9ea..fcd6ac23 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a840a9ea5548044c1901f5d4008aaa00553f99d7 +Subproject commit fcd6ac231d160afd5c11cc5ef515dcc61c3eca3f diff --git a/qttools b/qttools index d974321a..181b320c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d974321ae490f15f987bc587819a5536fdcf4a8f +Subproject commit 181b320c95e88be0a8e0843f14d134ae219181a3 diff --git a/qtwebengine b/qtwebengine index 099ffa62..0e5553a1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 099ffa623920355f3a70402ddfa49dd1a3ecb2f0 +Subproject commit 0e5553a1626cb707499d82c96e136ceb79dfb54d From 69d08a86b05e6d10012edb4246aebeeae48175e7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Sep 2016 14:03:08 +0300 Subject: [PATCH 47/58] Update submodules on '5.8' in qt5 Change-Id: Ie862b6f2ec78e6c24f8f5bd0ee959e598f3d33d8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 52121396..0e3d54f8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 52121396c55e6100316f006c87b4fdaa8b5a0719 +Subproject commit 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 diff --git a/qtbase b/qtbase index 7555a925..50908f02 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7555a925816e3244073803f0adc4d44640f5ac1d +Subproject commit 50908f023d83257dbc0b6d17bfe29e2f101615af diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c5a44092..ab91c571 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c5a44092c8b73c540862c4a160c31487a8518992 +Subproject commit ab91c57135f7a86437a5a4341cd32df1d4682480 diff --git a/qtwebengine b/qtwebengine index 001ee1d6..b04131f3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 001ee1d6da4bf6769d702810f8ebcb05978663cc +Subproject commit b04131f375a64204be962e7b92c88a3ecaf892c5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 21cc71ce..973105d9 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 21cc71ced3565585f7a2f94875ed845355ab2064 +Subproject commit 973105d9fb3372910255825e7395fb1156e24c02 From 3f7e68f8c0031f3aa41a773fe9ea09812b7e10c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Sep 2016 23:33:36 +0300 Subject: [PATCH 48/58] Update submodules on '5.6' in qt5 Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index c3b34277..e5878886 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c3b34277bc7b602185b2f4eccd19af270aa6b09d +Subproject commit e5878886ed8261fb5d3e1fb93595be03e8f12b8d diff --git a/qtbase b/qtbase index 6b9c57f8..d95cb94b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6b9c57f8cd3df65702db327616913fa9d8172237 +Subproject commit d95cb94baa6302bea6ad57a9690453e9b618421e diff --git a/qtdeclarative b/qtdeclarative index a273a0ad..f5e2783a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a273a0ad9c1df7aed612ee6353753f668d545076 +Subproject commit f5e2783acec1f46070330fc1ce90cb16901a5533 diff --git a/qtdoc b/qtdoc index ea17b457..f822f094 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea17b457b3b019685b5b72744aeaf3c5c2b7d53e +Subproject commit f822f0944a5bc6710df173f3fec67ae1e364ab85 diff --git a/qtlocation b/qtlocation index 7cfd70fa..8cb45ab8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7cfd70fa2f8fd24053d31122ac0a27eb56915895 +Subproject commit 8cb45ab8aabaf0246c49e3314e4a84456ff7b061 diff --git a/qtmultimedia b/qtmultimedia index e535480e..9d9a29bc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e535480e13c2ba0483f4a25be90c5db82529c25c +Subproject commit 9d9a29bcc31101e394ea484f61985cac75524ba1 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 diff --git a/qtwebengine b/qtwebengine index 9c0bd920..36feb681 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9c0bd9207560e36e7bad3657e02305aabd7638b9 +Subproject commit 36feb681a97b3dd690a54d2eafd58081036992f1 diff --git a/qtwebkit b/qtwebkit index 7be99344..490b7b65 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7be993442fac143ef7b13515b70f0ebacaca2935 +Subproject commit 490b7b65edbd06da0818c0ac765ca6ebd219dce3 From 233d142e8e9c88245781e92d83d350f7e6068e62 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 01:00:49 +0300 Subject: [PATCH 49/58] Update submodules on '5.6' in qt5 Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index d95cb94b..8e45fe6d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d95cb94baa6302bea6ad57a9690453e9b618421e +Subproject commit 8e45fe6d6c2084752983d905cf22f777e7062baf From dcc26dafadcf365baca0f3fabfd0a9707a63f0ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Sep 2016 15:21:23 +0300 Subject: [PATCH 50/58] Update submodules on '5.7' in qt5 Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 4329879b..829abebf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4329879b4d73936fe757591f19cb2a86cae1d6b7 +Subproject commit 829abebf3334218182d6b334855e4ae4658575f4 diff --git a/qtbase b/qtbase index 8d64d1e0..680dd331 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 +Subproject commit 680dd3313cd15ab4d9d6b8b3bde77aabbd8de0b0 diff --git a/qtdeclarative b/qtdeclarative index 345226aa..0aea0094 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 345226aa3ecee8642c3bf46e40c981d4a49d958e +Subproject commit 0aea009425242417bffdb171c8eca02ff52f4a7b diff --git a/qtmultimedia b/qtmultimedia index 256ee311..62eeaba6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 256ee311b936d69561e97f7f8ee832cff93cb509 +Subproject commit 62eeaba645d0f7c42246a0b026c532919a5b0454 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 85230f22..56bddc7f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 85230f227f38d56572ad4650dda9fcce3942f86d +Subproject commit 56bddc7fa4b0222d38fcc5e083b9588c3d2f8b93 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 diff --git a/qtserialbus b/qtserialbus index e13f9fe6..b3d27c68 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a +Subproject commit b3d27c681ac216f82ea8b2de1e21858a6c2b7af0 diff --git a/qtserialport b/qtserialport index fcd6ac23..dee818e7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fcd6ac231d160afd5c11cc5ef515dcc61c3eca3f +Subproject commit dee818e77a6cf9a6c164fbc7ee132fe875f7f998 diff --git a/qttranslations b/qttranslations index 19b6455c..c4795ce8 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 19b6455cbde56b340ec406f7b5bfdeb1c72c656a +Subproject commit c4795ce81f9165a05e6f918066c671808447c539 diff --git a/qtwebengine b/qtwebengine index 0e5553a1..a301473c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0e5553a1626cb707499d82c96e136ceb79dfb54d +Subproject commit a301473c4bd2a2956ea4986679b4a80f01bce2d9 From cce1584b787e8c5d4ed16feb882d7d9ed3abed42 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Sep 2016 15:25:59 +0300 Subject: [PATCH 51/58] Update submodules on '5.8' in qt5 Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 50908f02..eeb03fbf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50908f023d83257dbc0b6d17bfe29e2f101615af +Subproject commit eeb03fbf262e2a4790579c2100930799b0866057 diff --git a/qtdeclarative b/qtdeclarative index 58e6b10a..bbcf887f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 58e6b10a58e3d9b9bc5393819163af5afa734320 +Subproject commit bbcf887f43d2b9d84bb65d963a3c8b5e3108bafc diff --git a/qtgamepad b/qtgamepad index e10ce3bf..5a149c75 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e10ce3bfa5ed2290c9d210509bad3238d9bec8bc +Subproject commit 5a149c75d71e5d50e941d773a3ef17e1372de100 diff --git a/qtlocation b/qtlocation index 6eeda17e..573171bd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6eeda17e1e23b785b94592f8192c65c9c3b9d919 +Subproject commit 573171bd0c5a61880556daebfe340fea48834638 diff --git a/qtmultimedia b/qtmultimedia index 01c9322b..b7b7f0ab 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 01c9322bfe918b886468eb520d77b21b6d8c0c11 +Subproject commit b7b7f0abde7b12c9842a26d19c4bdff8436e5343 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ab91c571..f1eef22d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ab91c57135f7a86437a5a4341cd32df1d4682480 +Subproject commit f1eef22d0d1ddcc2ee48e45e522788eb97f429b0 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 diff --git a/qtscript b/qtscript index 52f416f7..c2b958dc 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 52f416f7889c2e63b901eeca07f2c5bda7b27b93 +Subproject commit c2b958dcc02730e54bbaa271d21f88ccb5e6945c diff --git a/qtscxml b/qtscxml index c217e28d..b8392286 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c217e28d44b135e459da50c4c7e8ad8bdf51b579 +Subproject commit b83922861ce7214eb5a2b192ab040c3cc8a42a96 diff --git a/qtserialbus b/qtserialbus index 620e1594..a69c8490 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 620e1594cb530e286169b2f5a6b1544fa79c594a +Subproject commit a69c84909c6fdc8cd9f8bafdf4ad4575ec634a4a diff --git a/qtwebengine b/qtwebengine index b04131f3..c30109f2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b04131f375a64204be962e7b92c88a3ecaf892c5 +Subproject commit c30109f24b253756bec249b3cd8853aa90fe0923 diff --git a/qtx11extras b/qtx11extras index 448211f0..0f912180 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 448211f022507c6e7787e47aca4b3f12e3f12d94 +Subproject commit 0f91218091da69a81eb3e3336d1bdbe572a21908 From ec6d9b53b4cedd3c0d52d15de968a910effc63b2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 16:57:26 +0300 Subject: [PATCH 52/58] Update submodules on '5.7' in qt5 Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index a301473c..91679cda 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a301473c4bd2a2956ea4986679b4a80f01bce2d9 +Subproject commit 91679cda526857bd915c646d171f018ba86469f4 From b0b0c9c471359393697389c870aaaad51dbb022f Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 18 Sep 2016 18:20:45 +0300 Subject: [PATCH 53/58] Changed slash direction in CI_CONAN_BUILDINFO_DIR Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 6d7cf07b..70962a41 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,7 +6,7 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT -[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:/Utils/conanbuildinfos", "Machine") function Run-Conan-Install { From 5ee2290c0c9d21230c46ba19f44e0a1f1ec772bf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 01:00:49 +0300 Subject: [PATCH 54/58] Update submodules on '5.6' in qt5 Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8e45fe6d..6ea626a3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e45fe6d6c2084752983d905cf22f777e7062baf +Subproject commit 6ea626a32fe070847629b6715c2a253717ff7412 diff --git a/qtdeclarative b/qtdeclarative index f5e2783a..79121a08 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5e2783acec1f46070330fc1ce90cb16901a5533 +Subproject commit 79121a0827df365468a02db20179d2c2d5ae720d diff --git a/qtserialbus b/qtserialbus index 3dfc46f0..0d31e8cd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3dfc46f069f3287c411ab178513d0ad47bf95352 +Subproject commit 0d31e8cd10d09fd2b28052c89a4f96c32c104848 From 40399ae1cc32d593108b18d3c58482df399c2030 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 20:44:43 +0300 Subject: [PATCH 55/58] Update submodules on '5.8' in qt5 Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index eeb03fbf..cd78457c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eeb03fbf262e2a4790579c2100930799b0866057 +Subproject commit cd78457c6d33bdd7c01fbcd78e50bc99e9c9acce diff --git a/qtdatavis3d b/qtdatavis3d index b6c5569f..96086b01 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b6c5569f2158e2f211b90bf36ea964fda7bf6ccc +Subproject commit 96086b01a3e732cfb58cfd6e15a8dfc53550eb13 diff --git a/qtdeclarative b/qtdeclarative index bbcf887f..765f3afc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bbcf887f43d2b9d84bb65d963a3c8b5e3108bafc +Subproject commit 765f3afccb34b16c249c609d788374320cfbd25d diff --git a/qtlocation b/qtlocation index 573171bd..408df361 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 573171bd0c5a61880556daebfe340fea48834638 +Subproject commit 408df3618681e668d6e330cbce1ebe5243107602 diff --git a/qtmultimedia b/qtmultimedia index b7b7f0ab..08048b0a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b7b7f0abde7b12c9842a26d19c4bdff8436e5343 +Subproject commit 08048b0ade60bdfb8e084b08345901b00f968e72 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f1eef22d..0e3636a4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f1eef22d0d1ddcc2ee48e45e522788eb97f429b0 +Subproject commit 0e3636a4692c9cf89d994f3fe5c1c110b4c6ee61 diff --git a/qtrepotools b/qtrepotools index 7b543793..eb645e91 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 +Subproject commit eb645e912dca963645caed932b9adaf184df5f57 diff --git a/qtscxml b/qtscxml index b8392286..9c9b5560 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b83922861ce7214eb5a2b192ab040c3cc8a42a96 +Subproject commit 9c9b556025d370bf70a60f46b1674a6c950fd491 diff --git a/qtserialbus b/qtserialbus index a69c8490..0ce9c85d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a69c84909c6fdc8cd9f8bafdf4ad4575ec634a4a +Subproject commit 0ce9c85d404f824e8df284f5f57345b2f9038836 diff --git a/qtwayland b/qtwayland index 3f5111b6..8d437e79 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3f5111b6c1d92ae4fed008abb53cf4226bfef575 +Subproject commit 8d437e79cdd41ede195ed1829d59b2b012b4d40d diff --git a/qtwebengine b/qtwebengine index c30109f2..65c264f5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c30109f24b253756bec249b3cd8853aa90fe0923 +Subproject commit 65c264f58969281392d4a4b42b35be9a352c7f7e diff --git a/qtwebview b/qtwebview index 67580ae6..c2753404 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 67580ae6e2f75d93aae1e3412bf9c042b2992320 +Subproject commit c275340496c36a0466dd66eba93031e89606c475 From 06c59b27dbf4364ae0547f70e8192864cd239eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 26 Sep 2016 11:41:00 +0300 Subject: [PATCH 56/58] COIN Provisioning: Disable selinux in rhel 7.2 Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7 Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh new file mode 100644 index 00000000..30162166 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh @@ -0,0 +1,5 @@ +# We need to disable selinux while we are overwriting some binaries +# required by it. If this is not done, ICU provisioning will create +# template that is not booting. + +sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g /etc/selinux/config From 1148171a5d1e481a19c1bb4f11d6316fbeb5286c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 26 Sep 2016 08:52:48 +0300 Subject: [PATCH 57/58] COIN Provisioning: Install ICU to RHEL 7.2 Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726 Reviewed-by: Heikki Halmet Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/install_icu.sh | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh new file mode 100644 index 00000000..682ea91c --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh @@ -0,0 +1,70 @@ +#!/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 installs the right ICU version + +set -e +icuVersion="56.1" +icuLocation="/usr/lib64" +sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" + +function Install7ZPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive" + rm $targetFile +} + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64" + +echo "Installing custom ICU devel packages on RHEL" + +sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" +develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +tempDir=`mktemp -d` || echo "Failed to create temporary directory" +trap "sudo rm -fr $tempDir" EXIT +Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir +sudo cp -a $tempDir/lib/* /usr/lib64 +sudo cp -a $tempDir/* /usr/ + +sudo /sbin/ldconfig From 657cab9312005308ee5204afd871325b4369af08 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 02:30:47 +0300 Subject: [PATCH 58/58] Update submodules on '5.7' in qt5 Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 7e638edb..eb0a7293 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e638edbd15640302516f9a69d20f62d26d4af06 +Subproject commit eb0a7293838234dba401fe96731f1fb5908fb7ac diff --git a/qtbase b/qtbase index 680dd331..8cd28ea8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 680dd3313cd15ab4d9d6b8b3bde77aabbd8de0b0 +Subproject commit 8cd28ea8850c5365c47dd65de16f528e2e223835 diff --git a/qtdoc b/qtdoc index c7ecd300..dab8e210 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7ecd300ab0c0cb7a9bafedab2ef792cdfa4d25d +Subproject commit dab8e210a5ed80e42499658fe662873e888d37b4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 56bddc7f..966c0348 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 56bddc7fa4b0222d38fcc5e083b9588c3d2f8b93 +Subproject commit 966c0348c7a19a17c5be53f87ef54d4fbab8d8c8