From 9584900b5ce8d103a58a6a8355c657998dbe053b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Aug 2016 11:52:19 +0200 Subject: [PATCH 01/27] Adjust submodule branches Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f --- .gitmodules | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index 743e2e8e..9db3a307 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.2 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.2 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.2 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,130 +136,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.2 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 5.6.2 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtpurchasing"] depends = qtbase From 4faee2071331d068a2c2b0ac62acc3d32b2fbc88 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Sep 2016 13:08:22 +0300 Subject: [PATCH 02/27] Update submodules on '5.6.2' in qt5 Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 1de9d68b..c3dda3b4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1de9d68b2631de9432ab9929bb4b917604cc7be7 +Subproject commit c3dda3b45ca718c47b26a46f745a53c167e1eda4 diff --git a/qtbase b/qtbase index 881bda9e..c8a6b427 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 881bda9e6ecdd8729edf7df68f94f72f5d7c9042 +Subproject commit c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4 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..dcede8bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c +Subproject commit dcede8bbe1a4e1401679d42bf7179305771d0c5a diff --git a/qtlocation b/qtlocation index fafc1584..7504b2ce 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fafc158427e9d54298ce5c3419c1d4b6ec3b946e +Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 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..1c973844 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 241894afcef4469fa9d678da44c475b20fedc10b +Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 diff --git a/qtquickcontrols b/qtquickcontrols index 5bd57528..846d04ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5bd57528b5cf7b22a81b1195d90b0a364c0428aa +Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 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/qttools b/qttools index f067e5d7..a9e5e09f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f067e5d7e510842825be883dade904a9a4d3ec05 +Subproject commit a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e 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..2209add7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e9b510bbf2b1311761c2a2f98d4410ab9b17f9e5 +Subproject commit 2209add7a5b019afef7830d8bbf416fbb2a2ecf5 diff --git a/qtwebview b/qtwebview index 20c00be8..aad32ba9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 20c00be872220f547211b87a2d3d34e12bd0f3d8 +Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 diff --git a/qtwinextras b/qtwinextras index 75385854..d80f8bcf 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 75385854e5973b28d13055d8896cb00380951466 +Subproject commit d80f8bcf503e607a3612343eacf8002c003b6588 From 25b385764e4a7f4d08ce96ede995f0c7dac67309 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 13 Sep 2016 12:19:30 +0200 Subject: [PATCH 03/27] 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 04/27] 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 efc461a174b03cf3b5dea8c9768b3141e5130f50 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Sep 2016 09:53:09 +0300 Subject: [PATCH 05/27] Update submodules on '5.6.2' in qt5 Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtbase b/qtbase index c8a6b427..f242b911 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4 +Subproject commit f242b91189e3bd0cc96dd1a2695eef0521099aea diff --git a/qtcanvas3d b/qtcanvas3d index 2778071f..85fe2daa 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2778071f6c80b5397a183db37114aef881ade855 +Subproject commit 85fe2daab5ed14655b456df8821c9f5f606fdc12 diff --git a/qtconnectivity b/qtconnectivity index 21e7cb1b..bd764955 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21e7cb1bafdfc06c263e10067d02f9b103ff660f +Subproject commit bd7649557e99be543b78492d96bb2982e0a3e4c4 diff --git a/qtdeclarative b/qtdeclarative index dcede8bb..c1d726fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dcede8bbe1a4e1401679d42bf7179305771d0c5a +Subproject commit c1d726fe19c83cf081042e55ace9d9d7b31c40e6 diff --git a/qtdoc b/qtdoc index aebe202e..2a3a8c9e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aebe202ec85d3a8a04772713786ffab838101934 +Subproject commit 2a3a8c9e86c8b66ee4109e66a3c38835504a97b6 diff --git a/qtlocation b/qtlocation index 7504b2ce..7d01112c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 +Subproject commit 7d01112c36a98912706e9d33ce2e36126de0ccec diff --git a/qtmultimedia b/qtmultimedia index 6d95682d..20686cb5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d95682d7ff282180655f2f384d8aba69c4f67af +Subproject commit 20686cb51fb2dfa5973d636875e9fc20c2bde4f5 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..59c6c0e0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 +Subproject commit 59c6c0e0b1b5b46747595a58e11311b7393d7e70 diff --git a/qtsensors b/qtsensors index 46d9a630..922c2bb6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 +Subproject commit 922c2bb671c113b7e481fb86f823188b4bce1d3e diff --git a/qtserialbus b/qtserialbus index c8305c87..0a4a5f7e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 +Subproject commit 0a4a5f7e1cbca7bd8b797603025534368de02cb7 diff --git a/qtserialport b/qtserialport index b0e3e746..46ef9fdc 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0e3e7469cf5249bb395d044c5344bbe88884553 +Subproject commit 46ef9fdc130a06bd80c5c004f0dc95c473f704c8 diff --git a/qtwayland b/qtwayland index f2124674..82e11583 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f21246748ce20cd86346e192fe0c4c76a9b08a7c +Subproject commit 82e11583928d47576c160d35c9df05c0eec34df8 diff --git a/qtwebengine b/qtwebengine index 2209add7..2f24e3c3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2209add7a5b019afef7830d8bbf416fbb2a2ecf5 +Subproject commit 2f24e3c307aecb657736310948c7cdaad5176678 diff --git a/qtwebkit b/qtwebkit index bb43bca1..b35917bc 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bb43bca1664721401c3a2c25b585913bb5e8cb4f +Subproject commit b35917bcb44d7f200af0f4ac68a126fa0aa8d93d diff --git a/qtwebview b/qtwebview index aad32ba9..6313ae2b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 +Subproject commit 6313ae2b2a4593d14b716201bf6cbb79d4812091 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 06/27] 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 891afe7066a0791f2a8f861c55328af4e3a0ddd3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 19 Sep 2016 02:30:49 +0300 Subject: [PATCH 07/27] 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 7c6a3f423a84cfdd96ae1734f7daf64af5577d07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Sep 2016 02:30:54 +0300 Subject: [PATCH 08/27] 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 0ad453a0fd6780234c63d1cf572ef1cc666bd304 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Sep 2016 08:10:38 +0300 Subject: [PATCH 09/27] Update submodules on '5.6.2' in qt5 Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index f242b911..f050f218 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f242b91189e3bd0cc96dd1a2695eef0521099aea +Subproject commit f050f2180ffb8298de802b33ad9f017312df1815 diff --git a/qtwebengine b/qtwebengine index 2f24e3c3..ec845078 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2f24e3c307aecb657736310948c7cdaad5176678 +Subproject commit ec84507898e58a167b185ba674acf300cc695380 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 10/27] 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 11/27] 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 12/27] 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 ec6d9b53b4cedd3c0d52d15de968a910effc63b2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 16:57:26 +0300 Subject: [PATCH 13/27] 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 c5557d43eea3c65591e37e3c79b6fa0f590c915b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 12:17:01 +0300 Subject: [PATCH 14/27] Update submodules on '5.6.2' in qt5 Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index f050f218..b4ada3f0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f050f2180ffb8298de802b33ad9f017312df1815 +Subproject commit b4ada3f0d8feed7dbff22aa780d38ab126020ac6 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 From b0b0c9c471359393697389c870aaaad51dbb022f Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 18 Sep 2016 18:20:45 +0300 Subject: [PATCH 15/27] 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 16/27] 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 657cab9312005308ee5204afd871325b4369af08 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 02:30:47 +0300 Subject: [PATCH 17/27] 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 From 77eeee64a43c5c448321b8f5ac7b64c872e14489 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 13:07:43 +0300 Subject: [PATCH 18/27] Upgrade CMake to 3.6.2 QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.ps1 | 10 ++++++++++ coin/provisioning/qtci-windows-10-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 | 1 + 3 files changed, 12 insertions(+) create mode 100644 coin/provisioning/common/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 new file mode 100644 index 00000000..6870f3a7 --- /dev/null +++ b/coin/provisioning/common/cmake.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" + +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" + +Extract-Zip $zip C: +Remove-Item C:\CMake -Force -Recurse +Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From c9d71e9eeb925ee4236acefeb88b14d80d04ba5e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 9 Sep 2016 13:12:51 +0300 Subject: [PATCH 19/27] Python to provisioning for Windows Installs Python version 2.7.10. Python is required for building Qt 5 from source. More specifically qtdeclarative and qtwebkit require it. Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e Reviewed-by: Jani Heikkinen --- .../common/01-windows_removethemall.ps1 | 61 ++++++++++++++++++ coin/provisioning/common/helpers.ps1 | 29 +++++++++ coin/provisioning/common/python.ps1 | 64 +++++++++++++++++++ .../01-windows_removethemall.ps1 | 1 + .../qtci-windows-10-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + .../qtci-windows-10-x86_64/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + .../qtci-windows-7-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + .../qtci-windows-8-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + .../qtci-windows-8-x86_64/python.ps1 | 1 + 13 files changed, 164 insertions(+) create mode 100644 coin/provisioning/common/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/common/python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/python.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/python.ps1 diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1 new file mode 100644 index 00000000..8285ddae --- /dev/null +++ b/coin/provisioning/common/01-windows_removethemall.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +Function Remove { +Param ( + [string]$1 + ) + If (Test-Path $1){ + echo "Remove $1" + Remove-Item -Recurse -Force $1 + }Else{ + echo "'$1' does not exists or already removed !!" + } + +} + +Function Remove-Path { + Param ( + [string]$Path + ) + echo "Remove $path from Path" + $name = "Path" + $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" + $type = "Machine" + [System.Environment]::SetEnvironmentVariable($name,$value,$type) +} + +# Remove Python +Remove C:\Python27 +Remove-Path C:\python27\scripts +Remove-Path C:\python27 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d7b957f3..0e684452 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -29,3 +29,32 @@ 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 + } +} + +function Add-Path +{ + Param ( + [string]$Path + ) + echo "Adding $Path to Path" + [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) +} diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 new file mode 100644 index 00000000..39d8146d --- /dev/null +++ b/coin/provisioning/common/python.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs Python $version. +# Python is required for building Qt 5 from source. + +$version = "2.7.10" +$package = "C:\Windows\temp\python-$version.msi" + +# check bit version +if ([System.Environment]::Is64BitProcess -eq $TRUE) { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi" + $sha1 = "f3a474f6ab191f9b43034c0fb5c98301553775d4" +} +else { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi" + $sha1 = "9e62f37407e6964ee0374b32869b7b4ab050d12a" +} + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q" +# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB +echo "Chancing allowZip64 value to 'True'..." +(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py +echo "Remove $package..." +del $package +Add-Path $path diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/python.ps1 b/coin/provisioning/qtci-windows-7-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/python.ps1 b/coin/provisioning/qtci-windows-8-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" From 680c596ca0507d7f8c024679a3cb619bb8ebc5f6 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 30 Sep 2016 14:08:36 +0000 Subject: [PATCH 20/27] Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR" This actually breaks conan integration in Coin instead of fixing it. This reverts commit b0b0c9c471359393697389c870aaaad51dbb022f. Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d 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 70962a41..6d7cf07b 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 bc65857c5872eee34de5a238f66c781570cb4f3d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 2 Oct 2016 02:30:54 +0300 Subject: [PATCH 21/27] Update submodules on '5.7' in qt5 Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index eb0a7293..cf00f2a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit eb0a7293838234dba401fe96731f1fb5908fb7ac +Subproject commit cf00f2a1d967e8413d138ffe010e6928b469cb30 diff --git a/qtactiveqt b/qtactiveqt index 829abebf..fab7808e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 829abebf3334218182d6b334855e4ae4658575f4 +Subproject commit fab7808e45c6742d7529b7df55f0d5e3fe9c7b50 diff --git a/qtbase b/qtbase index 8cd28ea8..4518345b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8cd28ea8850c5365c47dd65de16f528e2e223835 +Subproject commit 4518345b80b0ee1101ecb0e7349728abd237aa6e diff --git a/qtconnectivity b/qtconnectivity index aabce3a0..c4b8dee6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 +Subproject commit c4b8dee6b4cfdc6728094d237d7984791e2cecea diff --git a/qtdeclarative b/qtdeclarative index 0aea0094..e4134cfd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0aea009425242417bffdb171c8eca02ff52f4a7b +Subproject commit e4134cfd8086a78c61a46fdfb908ade27c8d9840 diff --git a/qtdoc b/qtdoc index dab8e210..822ed893 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dab8e210a5ed80e42499658fe662873e888d37b4 +Subproject commit 822ed893ecb973f0f42cb431b42a811a2bdcaa29 diff --git a/qtlocation b/qtlocation index 42372ce4..3f813d1c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 42372ce4c4114f7e38fc5ac681e9199869b4619f +Subproject commit 3f813d1c8c24e5da67d3f096eb3f5c73e760e641 diff --git a/qtqa b/qtqa index e49c7d6f..66911ea5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc +Subproject commit 66911ea5ba5fe6c5e44d40760008dd65efe2e705 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 966c0348..e95dc3b4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 966c0348c7a19a17c5be53f87ef54d4fbab8d8c8 +Subproject commit e95dc3b4853c1736aef0ef2cc5248ec0aa46e3ff diff --git a/qtrepotools b/qtrepotools index 7b543793..ef0773a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 +Subproject commit ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 diff --git a/qtserialbus b/qtserialbus index b3d27c68..f0482d70 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b3d27c681ac216f82ea8b2de1e21858a6c2b7af0 +Subproject commit f0482d704e3834f2199889f997b421c0171bd94f diff --git a/qttools b/qttools index 181b320c..ae9472a3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 181b320c95e88be0a8e0843f14d134ae219181a3 +Subproject commit ae9472a39327ce5d5d6735308bd2aef272771391 diff --git a/qtwebchannel b/qtwebchannel index d342edcc..2d29a774 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d342edcc22d3c9c0299e86805d93e7031507345b +Subproject commit 2d29a774dd165ee2acd0b607b7e0d02a37c5fea5 diff --git a/qtwebkit b/qtwebkit index 4671ed5b..9b4236a6 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 4671ed5b9df8f8edd3856b24bab93d7246f700f5 +Subproject commit 9b4236a660dcf0b9883fbc6dd388dccbe71ee0b2 diff --git a/qtwebsockets b/qtwebsockets index 6bef834d..0ba923d6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6bef834d17ea9978b99e309eb396e10c8b9fba4c +Subproject commit 0ba923d6130cf35ecbfebfe38efd8e98017c573d From e5627e6de35402ec227c95d5beef3fa04234d0dd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 5 Oct 2016 16:34:29 +0200 Subject: [PATCH 22/27] Update submodules on '5.7' in qt5 Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757 Reviewed-by: Allan Sandfeld Jensen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 91679cda..f8c132ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 91679cda526857bd915c646d171f018ba86469f4 +Subproject commit f8c132ffb7cd32d52bbfe09caa811665a3cb1069 From 433f6dddb56d757827643bd1fa7b101a7e179f16 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 18:34:14 +0300 Subject: [PATCH 23/27] Execute Conan installer synchronously PowerShell runs .exe's asynchronously by default, unlike all other commands. This behavior creates race condition when conanfile processing starts before conan installation is completed. Addition of "| Out-Null" to installer invocation makes it synchronous. Task-number: QTQAINFRA-998 Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380 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..a4c7ebe4 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -4,7 +4,7 @@ $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 +& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") From cf257c28694500251f5e193b469d9fd0c2414832 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 22:32:40 +0300 Subject: [PATCH 24/27] Pass compiler.runtime setting to conan When MSVC is not autodected, necessary setting compiler.runtime has undefined value, breaking installation of packages. This setting is not supported by MinGW, so it should be optional. Task-number: QTQAINFRA-998 Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 11 ++++++++--- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 3 ++- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index a4c7ebe4..481aa5f8 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -15,9 +15,14 @@ function Run-Conan-Install [string]$BuildinfoDir, [string]$Arch, [string]$Compiler, - [string]$CompilerVersion + [string]$CompilerVersion, + [string]$CompilerRuntime ) + if ($CompilerRuntime) { + $runtimeArg = "-s compiler.runtime=$($CompilerRuntime)" + } + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" @@ -27,7 +32,7 @@ function Run-Conan-Install -WorkingDirectory $outpwd ` -ArgumentList "install -i -f $($_.FullName)", ` '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` - -NoNewWindow -Wait + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($runtimeArg)" ` + -NoNewWindow -Wait -Verbose } } diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index 718d25de..d5f5f9e2 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -5,4 +5,5 @@ Run-Conan-Install ` -BuildinfoDir MSVC2015-x86 ` -Arch x86 ` -Compiler "Visual Studio" ` - -CompilerVersion 14 + -CompilerVersion 14 ` + -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 04887712..9cf4fbf1 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -5,4 +5,5 @@ Run-Conan-Install ` -BuildinfoDir MSVC2015-x86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` - -CompilerVersion 14 + -CompilerVersion 14 ` + -CompilerRuntime MD From 5b0a9d688b2e07c12b1d50f63d1a5ebd6b5ae117 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 22:33:40 +0300 Subject: [PATCH 25/27] Log arguments passed to Start-Process in Run-Conan-Install Task-number: QTQAINFRA-998 Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 481aa5f8..2d3d50e4 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -8,6 +8,12 @@ Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") +function Start-Process-Logged +{ + Write-Host "Start-Process", $args + Start-Process @args +} + function Run-Conan-Install { Param ( @@ -27,7 +33,7 @@ function Run-Conan-Install ForEach-Object { $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" New-Item $outpwd -Type directory -Force - Start-Process ` + Start-Process-Logged ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` -ArgumentList "install -i -f $($_.FullName)", ` From 0750f2b6ce3ffb92d7bb9a93716a3d7aed4fd5a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Oct 2016 20:11:54 +0300 Subject: [PATCH 26/27] Update submodules on '5.7' in qt5 Change-Id: I0fcbfa1705b1c2a93f5ced9a07d300e18ae9b7b3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index cf00f2a1..e7a846b6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cf00f2a1d967e8413d138ffe010e6928b469cb30 +Subproject commit e7a846b61d4635a1524fa16ce029ce47bc378c7e diff --git a/qtbase b/qtbase index 4518345b..6feec9da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4518345b80b0ee1101ecb0e7349728abd237aa6e +Subproject commit 6feec9da93032d11a768802ac2187d9d4153b1ec diff --git a/qtcharts b/qtcharts index a64d9547..da071825 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a64d954717a4b7fecc8eeea001e4a77483985132 +Subproject commit da071825245a4ec1dc4904a9d3329db5a132c074 diff --git a/qtconnectivity b/qtconnectivity index c4b8dee6..7b443cd0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c4b8dee6b4cfdc6728094d237d7984791e2cecea +Subproject commit 7b443cd0fdd1940a8bfaad73df5e309a52b7669f diff --git a/qtdeclarative b/qtdeclarative index e4134cfd..fff44776 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e4134cfd8086a78c61a46fdfb908ade27c8d9840 +Subproject commit fff4477661ae240c43088fa6d9069ccf969dbee8 diff --git a/qtdoc b/qtdoc index 822ed893..2c2150c6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 822ed893ecb973f0f42cb431b42a811a2bdcaa29 +Subproject commit 2c2150c61315a1bed3f638fc228f0ef9532ecd41 diff --git a/qtmultimedia b/qtmultimedia index 62eeaba6..256ff7bb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 62eeaba645d0f7c42246a0b026c532919a5b0454 +Subproject commit 256ff7bb1551f6c62c4ac861472ea29f45dbab3a diff --git a/qtquickcontrols b/qtquickcontrols index d9aae9ff..84b3cf1c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d9aae9ff99d20b58487b0a48801864d13115363b +Subproject commit 84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e95dc3b4..8144f238 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e95dc3b4853c1736aef0ef2cc5248ec0aa46e3ff +Subproject commit 8144f238999f7636de58e832865ca53e7e2a9e75 diff --git a/qtwebengine b/qtwebengine index f8c132ff..fe8ae4b7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f8c132ffb7cd32d52bbfe09caa811665a3cb1069 +Subproject commit fe8ae4b78065916e1882aaedc5994d66a8456df4 diff --git a/qtwebsockets b/qtwebsockets index 0ba923d6..60cede23 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0ba923d6130cf35ecbfebfe38efd8e98017c573d +Subproject commit 60cede232aca96f3f6852c54c0d97cf1771fb371 diff --git a/qtx11extras b/qtx11extras index 30b0e734..d311bf93 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 30b0e73404e7638fdf802990e81b98143f45c34f +Subproject commit d311bf931b60e91412bedd2751ad3a68095a7182 From f2fc36b021f6cb7a13543a1cd3b1f7fc6e1006af Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Oct 2016 01:41:42 +0300 Subject: [PATCH 27/27] Update submodules on '5.7' in qt5 Change-Id: Ib91dfec2ce8b7e794a26367f658581672d5cc2e2 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 6feec9da..3e71810c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6feec9da93032d11a768802ac2187d9d4153b1ec +Subproject commit 3e71810cf3153e4331fc075a73b6408adcf33654