From ae782a7f221cfe0b7b5cc64bddc16ae7330484cd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 20 Nov 2016 20:02:13 +0100 Subject: [PATCH 01/22] Update submodules on '5.8' in qt5 Change-Id: Ife77ec1889a7791fec833343329fc0c6b3345b34 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 1dfeff5e..9af5994e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1dfeff5ef3bbe827ac73ef6044de4ee9a660ed0a +Subproject commit 9af5994e9e9e13a710230fd2c763d62dd131376c diff --git a/qtbase b/qtbase index f817a995..32b99a38 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f817a995b2f72d4d293816de7ae05b37585eb48d +Subproject commit 32b99a38c563e4037362a25b2a749e2261bf16da diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 236491b5..de4ff95c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 236491b5b562066381be8ea2fd08f88a9b4dc2ed +Subproject commit de4ff95cd166b13fb4818ada5493d913345ef0ef diff --git a/qtserialbus b/qtserialbus index d5da7704..6a3deef9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d5da770414b37693d0c4a6393931e9eade4ca8f2 +Subproject commit 6a3deef9f6b6d113f834ef4396002bd384d476fa From c28672909f13bb3591327b157975a1c83ef49800 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 23 Nov 2016 19:09:30 +0100 Subject: [PATCH 02/22] Update submodules on '5.8' in qt5 Change-Id: I3c22d33c28648ff6a9992200629e827533186fe1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 9af5994e..ab0cd65b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9af5994e9e9e13a710230fd2c763d62dd131376c +Subproject commit ab0cd65b7e1ea3b96804bf759a9a5fb0b95061bf diff --git a/qtbase b/qtbase index 32b99a38..60054b59 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 32b99a38c563e4037362a25b2a749e2261bf16da +Subproject commit 60054b5940b19f4dd9780e63da1e2dce45baf131 diff --git a/qtcharts b/qtcharts index f4554629..9b68fb59 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f455462999bc8d2cd3c9a53b40e94d985baab4a9 +Subproject commit 9b68fb59c7b4d2b2b273bf83fe25ac782f7a2d00 diff --git a/qtconnectivity b/qtconnectivity index 8155f215..73e02ede 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8155f2156d5c6936edcac95c6a93ca7f96b1d13f +Subproject commit 73e02ede397a03108b8cc0d9a7775448145a0682 diff --git a/qtdeclarative b/qtdeclarative index 5b2c7187..7b7fb7fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5b2c71877a34597b82d2ce81494b9e91c7e31cb8 +Subproject commit 7b7fb7fe3ab8ce5db744329b2f138fd8b2a811ea diff --git a/qtlocation b/qtlocation index 396d57ae..f52d84f4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 396d57ae906bf6273eb3924929f4fccdf211c46f +Subproject commit f52d84f4c750dfdaba8f4f0c241994b7364ec5fc diff --git a/qtmultimedia b/qtmultimedia index af6b32f7..24a1c04b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit af6b32f73200f36a78e142bd5c7add7691b718e7 +Subproject commit 24a1c04b69cec2d7aff70b4dc7e44a19313c62bf diff --git a/qtquickcontrols2 b/qtquickcontrols2 index de4ff95c..4236abbd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit de4ff95cd166b13fb4818ada5493d913345ef0ef +Subproject commit 4236abbd68560aef74fb70ecc2b0bc34d17cda7c diff --git a/qtrepotools b/qtrepotools index 973462d6..d4c099dd 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 973462d65beec6e6208f867bcc6f44ffd34dfa0c +Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c diff --git a/qtscxml b/qtscxml index 55ecedbd..6fa9b98c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 55ecedbd904ca95ec772bf231c6c5d83882e788f +Subproject commit 6fa9b98c7d67b4ffd7d859ad54b8213675c0e4bb diff --git a/qtserialbus b/qtserialbus index 6a3deef9..ceda8fb8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6a3deef9f6b6d113f834ef4396002bd384d476fa +Subproject commit ceda8fb85392543583144eee476b16f7595c3a69 diff --git a/qtwayland b/qtwayland index 7197be7c..20869ff8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7197be7c0e9d00f98551d12bcc30782503612fe9 +Subproject commit 20869ff8a1ae94475036a093c0ab421af95d840a diff --git a/qtwebengine b/qtwebengine index da1d5274..a5c20a32 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit da1d5274616d026e410f7e39c6b1ec8886bb7be5 +Subproject commit a5c20a32def14aae8d3449408fa86111f771c95e From b2d2d7bfff8140b2a629f565a156f26dcd4f8027 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 26 Nov 2016 12:49:43 +0100 Subject: [PATCH 03/22] Update submodules on '5.8' in qt5 Change-Id: I102175b389cd2470429d0b30bd2be1c92b90b5cf Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index ab0cd65b..4f46ccc4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ab0cd65b7e1ea3b96804bf759a9a5fb0b95061bf +Subproject commit 4f46ccc4517a52b152d36e7734c2042e06ea8de3 diff --git a/qtbase b/qtbase index 60054b59..d34be324 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 60054b5940b19f4dd9780e63da1e2dce45baf131 +Subproject commit d34be3243419246d3b4966f6be8e345747723184 diff --git a/qtdeclarative b/qtdeclarative index 7b7fb7fe..8bf579d8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7b7fb7fe3ab8ce5db744329b2f138fd8b2a811ea +Subproject commit 8bf579d8d4feb13ca8651e98dd762b28483abe9e diff --git a/qtlocation b/qtlocation index f52d84f4..a98315f6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f52d84f4c750dfdaba8f4f0c241994b7364ec5fc +Subproject commit a98315f652518cb6f2d0a2845dc1d1581c3dbbc0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4236abbd..52d042e8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4236abbd68560aef74fb70ecc2b0bc34d17cda7c +Subproject commit 52d042e8a0324dbb05fb4f46fb9ea774ec168697 diff --git a/qtsvg b/qtsvg index 5a00abde..cb2aafda 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5a00abdefd1c050aae8760dfc01ae5e3631077aa +Subproject commit cb2aafdaa09e992982eb3aac318cfde38e65b2ac diff --git a/qtwayland b/qtwayland index 20869ff8..7916eb86 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 20869ff8a1ae94475036a093c0ab421af95d840a +Subproject commit 7916eb86bd24cf9ed16e10185790df6cc44fb8d4 diff --git a/qtwebengine b/qtwebengine index a5c20a32..a79fd913 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a5c20a32def14aae8d3449408fa86111f771c95e +Subproject commit a79fd91391c489ea1cd7baf717778b75e4847b92 From 18a8082944d5383ee4dff0e513680f720c6e741a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 26 Nov 2016 20:02:19 +0100 Subject: [PATCH 04/22] Update submodules on '5.8' in qt5 Change-Id: I602135f4911ae5dd19f188582f3b124eace332fd Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcanvas3d | 2 +- qtdatavis3d | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index d72a0b44..f89a4518 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d72a0b44812c38fc3ba9dd5b3deb87796b5c338a +Subproject commit f89a45187fc367d3932ba69cd708263fcaff8356 diff --git a/qtandroidextras b/qtandroidextras index 8bd0a0e5..86c02b98 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8bd0a0e5215227c5e56966fead0987e306eaccb8 +Subproject commit 86c02b9839fc9969ac6efb393b7838513955e3ab diff --git a/qtcanvas3d b/qtcanvas3d index 6c5121ea..c8cf923e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6c5121eab75e61f807c2df0f14988317f220b945 +Subproject commit c8cf923ee5076db1b37fdd012994adf72ce6445e diff --git a/qtdatavis3d b/qtdatavis3d index 3f5c2790..a78f8d6b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3f5c27908314074f177454ddcb1c18fce123fa6c +Subproject commit a78f8d6bef57dd4283094a52551705ee02909970 diff --git a/qtgamepad b/qtgamepad index 31f7e978..dc599eca 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 31f7e978fa683a5c0402fd1ae688160093bd0583 +Subproject commit dc599eca071d545aab3f6a5c854911cac9585a57 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8b5cb618..86368278 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8b5cb6185a014eb65150bef11aebdecb6a723aef +Subproject commit 863682782bd7ba3edc33d3e13938437af0637320 diff --git a/qtimageformats b/qtimageformats index 52dd6b1e..65db62e4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 52dd6b1e9a3fe249b153bdcebe08455ff716309d +Subproject commit 65db62e4398c5ddfba1ea7825987b3f4ab04369e diff --git a/qtmacextras b/qtmacextras index 57b57399..844ad02c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 57b5739923a741aa4317c11c5e86c911cc25f798 +Subproject commit 844ad02c5d7ba8feec23f51a6338d1a202d6fc60 diff --git a/qtpurchasing b/qtpurchasing index 2f76b086..e78e73df 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2f76b08661db03302a5f406e735068cde5a603bc +Subproject commit e78e73dfaf46c1a9b5906765ba3665b42a447789 diff --git a/qtquickcontrols b/qtquickcontrols index 79bd1646..84b48cad 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 79bd1646a8f317f4c6b5a6342b8aa6056b6c8b79 +Subproject commit 84b48cadc8f68d57d1a750e6aec690f46582e0c5 diff --git a/qtscript b/qtscript index 89e980b8..dcc9a3fd 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 89e980b8e0007a3615d01286d1f590fb95757233 +Subproject commit dcc9a3fdbf14e14a40bed106a0af93e7134690d4 diff --git a/qtsensors b/qtsensors index 5bf1bd00..07bf3002 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5bf1bd00335d0c95c54de426a02da2a98257fedb +Subproject commit 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 diff --git a/qtserialbus b/qtserialbus index ceda8fb8..fb63280f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ceda8fb85392543583144eee476b16f7595c3a69 +Subproject commit fb63280f12042be341df9de55aa94ca23e991fe9 diff --git a/qtserialport b/qtserialport index e2a658a2..4e667fa7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e2a658a2472d9fa710c251a065f488bae981c0ae +Subproject commit 4e667fa7f88144e198692d9794baacc86bb4eb98 diff --git a/qtsvg b/qtsvg index cb2aafda..51ef7e2e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit cb2aafdaa09e992982eb3aac318cfde38e65b2ac +Subproject commit 51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 diff --git a/qttools b/qttools index d743e5a7..1ba2796c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d743e5a7583f242142bcab3ce927490228c5df29 +Subproject commit 1ba2796c6b32e33824230fe85300f4ee4d615ab5 diff --git a/qttranslations b/qttranslations index 0d5e6231..3ddc1739 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0d5e62314c34f0de87b19eca3f91d31ac62ba8b5 +Subproject commit 3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06 diff --git a/qtwayland b/qtwayland index 7916eb86..5e0b47d4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7916eb86bd24cf9ed16e10185790df6cc44fb8d4 +Subproject commit 5e0b47d4bfc2486376ea525e2be25c5101ef814d diff --git a/qtwebchannel b/qtwebchannel index bf66a853..8cc9153f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bf66a8531e0ada3ade7e873bc3fae824237acd3e +Subproject commit 8cc9153f413c36d505794adfaca4f4724692fa81 diff --git a/qtwebkit b/qtwebkit index 431520f1..67fef930 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 431520f1508e92272171c214b087183e71d08ec5 +Subproject commit 67fef93059ba23812d7390ec7bb8d70f8e7b0492 diff --git a/qtwebkit-examples b/qtwebkit-examples index 1a839b50..f0898f83 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 1a839b50564782feac2e5dd439686c2a0ed7d985 +Subproject commit f0898f83abdcacc8bd3bca3479884376b0963398 diff --git a/qtwebsockets b/qtwebsockets index ccb13854..5e66a1c5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ccb138548314a767a897496c74c04a261a391027 +Subproject commit 5e66a1c5d25caef259e6e8b41023004c2b8de355 diff --git a/qtwebview b/qtwebview index fdf3a401..5c5c135b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fdf3a401b743c2e72c20f901641907b6a6ffc956 +Subproject commit 5c5c135ba8f82161f3e93b367ffacd63dc9111a3 diff --git a/qtx11extras b/qtx11extras index 0f912180..177a8090 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 0f91218091da69a81eb3e3336d1bdbe572a21908 +Subproject commit 177a8090fbe346ab34040acc60655dcb768ebf4f diff --git a/qtxmlpatterns b/qtxmlpatterns index 977d0fb3..594ad16a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 977d0fb3f0bf776e2aad3c8ff795115ce62909ff +Subproject commit 594ad16ae17072a44219228783f2ae051f88eba0 From 794392344dab9d5b5fcd60b6b3b93a4693e926f8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 30 Nov 2016 07:01:43 +0100 Subject: [PATCH 05/22] Update submodules on '5.8' in qt5 Change-Id: Ib16f362b961d0522c5f990d59f1e5d3974992190 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 4f46ccc4..a2c6c81f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4f46ccc4517a52b152d36e7734c2042e06ea8de3 +Subproject commit a2c6c81f5c67390629a313ff7ba985d0967ca1fa diff --git a/qtbase b/qtbase index d34be324..97b8fdab 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d34be3243419246d3b4966f6be8e345747723184 +Subproject commit 97b8fdab7d3604294476bf566b024ecbd5b412b0 diff --git a/qtcharts b/qtcharts index 9b68fb59..38386fda 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9b68fb59c7b4d2b2b273bf83fe25ac782f7a2d00 +Subproject commit 38386fda213cd50e3a3284b69ae15d5f33a7e049 diff --git a/qtconnectivity b/qtconnectivity index 73e02ede..643999d6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 73e02ede397a03108b8cc0d9a7775448145a0682 +Subproject commit 643999d60d3f76e3d24b1c2dca80533a0a0cdb52 diff --git a/qtdatavis3d b/qtdatavis3d index a78f8d6b..4913ce86 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a78f8d6bef57dd4283094a52551705ee02909970 +Subproject commit 4913ce866f9dcd7763edd7cec8880bca8a7eea76 diff --git a/qtdeclarative b/qtdeclarative index 8bf579d8..005857c4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8bf579d8d4feb13ca8651e98dd762b28483abe9e +Subproject commit 005857c492ff2a907987e5aed4c61163a6f3fc44 diff --git a/qtdoc b/qtdoc index 8d950967..cfc96b57 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8d950967dbfd75f6154d0fbe3213f13519b12f66 +Subproject commit cfc96b579d3733160ec100bf547562ae59ac2629 diff --git a/qtlocation b/qtlocation index a98315f6..ba9b7b9e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a98315f652518cb6f2d0a2845dc1d1581c3dbbc0 +Subproject commit ba9b7b9ef674d93680070f6c4bb1053d0d2325dd diff --git a/qtmultimedia b/qtmultimedia index 24a1c04b..77567bad 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 24a1c04b69cec2d7aff70b4dc7e44a19313c62bf +Subproject commit 77567bad82081ffb166578bdeac52fb1f2dce464 diff --git a/qtqa b/qtqa index cd6bd183..ecdfbf2e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd6bd183192764546bd7f0909a5bad3848b9d18a +Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 52d042e8..f574ad46 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 52d042e8a0324dbb05fb4f46fb9ea774ec168697 +Subproject commit f574ad46bccbe70b0fd36a556f1cafbdcb489504 diff --git a/qtscxml b/qtscxml index 6fa9b98c..8a3dae92 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6fa9b98c7d67b4ffd7d859ad54b8213675c0e4bb +Subproject commit 8a3dae92910e9df5817d9cde16aef81e76bfc60f diff --git a/qttools b/qttools index 1ba2796c..edab1812 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1ba2796c6b32e33824230fe85300f4ee4d615ab5 +Subproject commit edab1812c5c43c97f9a80ca809d87371cdba35bd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 947a5514..cfa4ab4c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 947a55149aec2724158934efde1be496b3c5e04e +Subproject commit cfa4ab4cbf13971d4b71ee920353822755a3bf31 diff --git a/qtwayland b/qtwayland index 5e0b47d4..545ef2e2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5e0b47d4bfc2486376ea525e2be25c5101ef814d +Subproject commit 545ef2e21d74128733f3b9b117d7c6024826cbb5 diff --git a/qtwebengine b/qtwebengine index a79fd913..a40688a6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a79fd91391c489ea1cd7baf717778b75e4847b92 +Subproject commit a40688a63d131bb024e46d817a388011ccab3ca2 diff --git a/qtwebview b/qtwebview index 5c5c135b..22697dac 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5c5c135ba8f82161f3e93b367ffacd63dc9111a3 +Subproject commit 22697dac66be3d380540546dfe7d68094befb560 diff --git a/qtwinextras b/qtwinextras index 13604e3f..ac32e1ed 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 13604e3fcc12a536d228f415ce65ca1c86b7015b +Subproject commit ac32e1ed4c5f83dfbef3ee5ac8b8c37852269f85 From 877b3b9991bc6914e94bd1d1fcc258385b2d79b9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 30 Nov 2016 22:18:41 +0100 Subject: [PATCH 06/22] Update submodules on '5.8' in qt5 Change-Id: I0af8e18f49f251a347eb5afd9037bd0462edc9a9 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index a2c6c81f..1a748a49 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a2c6c81f5c67390629a313ff7ba985d0967ca1fa +Subproject commit 1a748a493351f1dff0863496123ea50c574effdc diff --git a/qtbase b/qtbase index 97b8fdab..e3ca4287 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 97b8fdab7d3604294476bf566b024ecbd5b412b0 +Subproject commit e3ca4287d99a8b1a5769c19b97679cd95b4e83e4 diff --git a/qtdeclarative b/qtdeclarative index 005857c4..b19ebe1d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 005857c492ff2a907987e5aed4c61163a6f3fc44 +Subproject commit b19ebe1d23e1f2fd334cef4ec2731ab5cc69dbd7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f574ad46..5efd4b6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f574ad46bccbe70b0fd36a556f1cafbdcb489504 +Subproject commit 5efd4b6a61498f0668d7367d620275367894140e diff --git a/qttools b/qttools index edab1812..d9042fa9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit edab1812c5c43c97f9a80ca809d87371cdba35bd +Subproject commit d9042fa9c2f96f574f4caac290639918a368c185 diff --git a/qtwayland b/qtwayland index 545ef2e2..e572a0de 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 545ef2e21d74128733f3b9b117d7c6024826cbb5 +Subproject commit e572a0dead05e76603a4f783a6f688fd51f46734 From 91191afe3fdccd6ec7b4bac3c18e058a812e046b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 3 Dec 2016 20:02:21 +0100 Subject: [PATCH 07/22] Update submodules on '5.8' in qt5 Change-Id: Ibfed6d06a7f83a124b185c18ee690b2fb3141271 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index e3ca4287..e3b6f6d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e3ca4287d99a8b1a5769c19b97679cd95b4e83e4 +Subproject commit e3b6f6d16577c74433de1ca9e15402cdf285abca diff --git a/qtcanvas3d b/qtcanvas3d index c8cf923e..69b9f0de 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c8cf923ee5076db1b37fdd012994adf72ce6445e +Subproject commit 69b9f0de3d805a32e08533502ca5503901a4c555 diff --git a/qtconnectivity b/qtconnectivity index 643999d6..b8e19bf5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 643999d60d3f76e3d24b1c2dca80533a0a0cdb52 +Subproject commit b8e19bf50003a427fc719986a3434f57b04cf07b diff --git a/qtdatavis3d b/qtdatavis3d index 4913ce86..21c82c7e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4913ce866f9dcd7763edd7cec8880bca8a7eea76 +Subproject commit 21c82c7e0db0a567c11ed80eac955d86ad0e1dff diff --git a/qtdeclarative b/qtdeclarative index b19ebe1d..aabeeda5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b19ebe1d23e1f2fd334cef4ec2731ab5cc69dbd7 +Subproject commit aabeeda52c3b4d2e3327bfd00642d2d7c980719b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5efd4b6a..3bea7170 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5efd4b6a61498f0668d7367d620275367894140e +Subproject commit 3bea717006ae660a933025514f21b7810262535a diff --git a/qtscript b/qtscript index dcc9a3fd..033eeff8 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit dcc9a3fdbf14e14a40bed106a0af93e7134690d4 +Subproject commit 033eeff87015f6ffa1e6a73dcc6c8a20479511e4 diff --git a/qtscxml b/qtscxml index 8a3dae92..10bcb2ee 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8a3dae92910e9df5817d9cde16aef81e76bfc60f +Subproject commit 10bcb2ee73b557a9dfd72143f7bf0b42c607ecaf diff --git a/qtsensors b/qtsensors index 07bf3002..2c595c38 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 +Subproject commit 2c595c382c50a5632b14eda00d85a9b7fcb09b5d diff --git a/qtserialbus b/qtserialbus index fb63280f..254d78c8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb63280f12042be341df9de55aa94ca23e991fe9 +Subproject commit 254d78c86343d178305b57ba58d7b53bff845542 From d0552ebf2d401944d3e263000e23ca41a060d00c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 6 Dec 2016 18:59:10 +0100 Subject: [PATCH 08/22] Fix macOS provisioning not shutting down cleanly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 ++++++++ .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 ++++++++ coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ++++++++++ coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh new file mode 100644 index 00000000..73e5efa7 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# OS X 10.8 and VMWare tools don't play well together. +# The shutdown command fails, so just shut down the machine +# manually when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh new file mode 100644 index 00000000..1f17b545 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make sure to shut down the machine cleanly when provisioning is done. + +# +1 minute delay to make sure that the setup finishes +# and can clean up before being interrupted by the shutdown + +sudo shutdown -h +1 From 3718450891310a2186c0328415d14f0deaf34649 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 5 Dec 2016 16:21:46 +0100 Subject: [PATCH 09/22] Fix paths for provisioning on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 .../001-crashreporter.sh} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/{qtci-osx-10.10/crashreporter.sh => qtci-osx-10.10-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.11/crashreporter.sh => qtci-osx-10.11-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.8/crashreporter.sh => qtci-osx-10.8-x86_64/001-crashreporter.sh} (100%) rename coin/provisioning/{qtci-osx-10.9/crashreporter.sh => qtci-osx-10.9-x86_64/001-crashreporter.sh} (100%) diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10/crashreporter.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11/crashreporter.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.8/crashreporter.sh rename to coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.9/crashreporter.sh rename to coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh From be37958406f92ac78b5d3d5d00b0844c80cbd9bf Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Dec 2016 14:09:25 +0100 Subject: [PATCH 10/22] Disable the screensaver on macOS definitely and permanently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../qtci-osx-10.10-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.11-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.8-x86_64/002-disable-screensaver.sh | 3 +++ .../qtci-osx-10.9-x86_64/002-disable-screensaver.sh | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh new file mode 100644 index 00000000..6f4de5f2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults -currentHost write com.apple.screensaver idleTime 0 From 0ce4f02c5f40eb8a3323db69683d04f9bb3df88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 5 Dec 2016 14:03:56 +0100 Subject: [PATCH 11/22] Suppress shutdown indicator in Ubuntu We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../001-suppress-shutdown-indicator.sh | 4 ++++ .../{001-apt-update.sh => 003-apt-update.sh} | 0 4 files changed, 12 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{001-apt-update.sh => 003-apt-update.sh} (100%) diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh new file mode 100644 index 00000000..f11263b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +# Disable questions on shutdown. +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh From 16d05b088e054ed4442d8acd3884dde741ead56d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 8 Dec 2016 08:18:50 +0100 Subject: [PATCH 12/22] Improve disabling of screensaver on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki --- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- .../002-disable-screensaver.sh | 25 ++++++++++++++++++- 4 files changed, 96 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh index 6f4de5f2..44df94e7 100644 --- a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh @@ -1,3 +1,26 @@ #!/bin/sh -defaults -currentHost write com.apple.screensaver idleTime 0 +mkdir -p $HOME/Library/LaunchAgents +cat >$HOME/Library/LaunchAgents/no-screensaver.plist < + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT From 4cc6c5b7ee1211f5b5cae9167fe43749c5ce47e7 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 9 Dec 2016 09:34:26 +0100 Subject: [PATCH 13/22] Update submodules on '5.8' in qt5 Change-Id: Iab0f72430400b83be8664c232394959d81a9f28c Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit-examples | 2 +- qtx11extras | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 1a748a49..62409fba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1a748a493351f1dff0863496123ea50c574effdc +Subproject commit 62409fbafc0cf5b11d2a3c646f97f527668b9ae1 diff --git a/qtactiveqt b/qtactiveqt index f89a4518..63d2cb62 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f89a45187fc367d3932ba69cd708263fcaff8356 +Subproject commit 63d2cb62f092e3932186c666db888ff3b61b51cd diff --git a/qtbase b/qtbase index e3b6f6d1..b0c321a8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e3b6f6d16577c74433de1ca9e15402cdf285abca +Subproject commit b0c321a8db7b75d740d968c6a583473600faf990 diff --git a/qtconnectivity b/qtconnectivity index b8e19bf5..1750983d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b8e19bf50003a427fc719986a3434f57b04cf07b +Subproject commit 1750983d3f053316c735d602c7f9a1b56dc4462b diff --git a/qtdeclarative b/qtdeclarative index aabeeda5..260f45d5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aabeeda52c3b4d2e3327bfd00642d2d7c980719b +Subproject commit 260f45d539b3ec1b28f593706ce7c164836f814c diff --git a/qtimageformats b/qtimageformats index 65db62e4..caaa463a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 65db62e4398c5ddfba1ea7825987b3f4ab04369e +Subproject commit caaa463a3e08cf006990dc855c0374671143e116 diff --git a/qtmultimedia b/qtmultimedia index 77567bad..7bc23038 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 77567bad82081ffb166578bdeac52fb1f2dce464 +Subproject commit 7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3bea7170..1bcd068c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3bea717006ae660a933025514f21b7810262535a +Subproject commit 1bcd068c082b3fab92637686447c2c82b4a0968c diff --git a/qtserialbus b/qtserialbus index 254d78c8..bb999860 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 254d78c86343d178305b57ba58d7b53bff845542 +Subproject commit bb999860c46757d9afd6c36fdba11ebe96caccc1 diff --git a/qtserialport b/qtserialport index 4e667fa7..f23aa97a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4e667fa7f88144e198692d9794baacc86bb4eb98 +Subproject commit f23aa97aeca62d9ddcc753ab97fa3b6c297db5b9 diff --git a/qtsvg b/qtsvg index 51ef7e2e..eb749198 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 +Subproject commit eb74919884f14c0ceebb63d512768ea1c8823b84 diff --git a/qttools b/qttools index d9042fa9..c0afdf0f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d9042fa9c2f96f574f4caac290639918a368c185 +Subproject commit c0afdf0fdc3c4572ba23bfd6a94e7fd64dd0067d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cfa4ab4c..adabc870 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cfa4ab4cbf13971d4b71ee920353822755a3bf31 +Subproject commit adabc870bc1e60bb57edb6be21471d1c3f83b923 diff --git a/qtwayland b/qtwayland index e572a0de..96f3206c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e572a0dead05e76603a4f783a6f688fd51f46734 +Subproject commit 96f3206c8cbe9cb55e1b3c9f3ae146ccbd6a0d2f diff --git a/qtwebengine b/qtwebengine index a40688a6..5ec330ce 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a40688a63d131bb024e46d817a388011ccab3ca2 +Subproject commit 5ec330cec86cd7781ced295790ce93ac8748dcc4 diff --git a/qtwebkit-examples b/qtwebkit-examples index f0898f83..18418904 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit f0898f83abdcacc8bd3bca3479884376b0963398 +Subproject commit 184189043bb69a0f14dd019e708decc98a4385f9 diff --git a/qtx11extras b/qtx11extras index 177a8090..aa43efab 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 177a8090fbe346ab34040acc60655dcb768ebf4f +Subproject commit aa43efab9b7a9bad002ebc5e2ede061f641cb90e From 42e12a14f04fc4791eef0dedd296db8549896883 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 10 Dec 2016 11:01:57 +0100 Subject: [PATCH 14/22] Update submodules on '5.8' in qt5 Change-Id: I245111cba87f41dfb18ca13527960d24e0a84700 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 62409fba..a3470904 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 62409fbafc0cf5b11d2a3c646f97f527668b9ae1 +Subproject commit a3470904a7c07852307d72ad87129901e6a3506b diff --git a/qtactiveqt b/qtactiveqt index 63d2cb62..b4fc0df8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 63d2cb62f092e3932186c666db888ff3b61b51cd +Subproject commit b4fc0df834412de5b25b105a2141968d53d37df2 diff --git a/qtbase b/qtbase index b0c321a8..8005e065 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0c321a8db7b75d740d968c6a583473600faf990 +Subproject commit 8005e0652c367c5e8c780a298d9fee4ce18a370a diff --git a/qtdeclarative b/qtdeclarative index 260f45d5..1ababa4a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 260f45d539b3ec1b28f593706ce7c164836f814c +Subproject commit 1ababa4a756dc4cc0ae474b15cccfbfa8727e505 diff --git a/qtwayland b/qtwayland index 96f3206c..391c71b4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 96f3206c8cbe9cb55e1b3c9f3ae146ccbd6a0d2f +Subproject commit 391c71b4488d69f3a0b16171b01f569fbc9ec07b diff --git a/qtwebengine b/qtwebengine index 5ec330ce..53d58600 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5ec330cec86cd7781ced295790ce93ac8748dcc4 +Subproject commit 53d586000b6ea002d96da0a2cb30d26a61c46635 From 2f9d551948323c86e727d246c34c5f46a3661b8c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 8 Dec 2016 20:01:26 +0100 Subject: [PATCH 15/22] Update submodules on '5.7' in qt5 Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 50aeedd8..04f68053 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50aeedd86ce0244fbb77ebefdce8da72db881e45 +Subproject commit 04f68053df5c90dca6947c6d2a5bb4e6851e62bb diff --git a/qtconnectivity b/qtconnectivity index 042e26bc..61afd66f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 042e26bccd2e53447229035c2b31cc1ab853335e +Subproject commit 61afd66f148af4a8d3e0cad12b7c9419f1122cbe diff --git a/qtdoc b/qtdoc index becd0cfc..73dc5f8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit becd0cfc4bcbaa5fe0eca0cca6e97961bc5ad911 +Subproject commit 73dc5f8de51ad1fcaff8e30188de23a4d6ff39b4 diff --git a/qtqa b/qtqa index cd6bd183..ecdfbf2e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd6bd183192764546bd7f0909a5bad3848b9d18a +Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6aa97038..838fd791 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6aa97038e26bab96455b2fc3febc5d358a5e7599 +Subproject commit 838fd79152957f457a47cd30970961a27f086848 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e67e97e9..c2a58836 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e67e97e9543eae2de42666eec3ff4d3cdca81db3 +Subproject commit c2a58836ba4a9671520da132ee2891245a56405f From 94080ce9cf81f3f7d22216eaf3306e74a9c1b65a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 12 Dec 2016 18:41:57 +0100 Subject: [PATCH 16/22] Update submodules on '5.8' in qt5 Change-Id: I867f4a94c3cc5ff7252339520cc10721937e1187 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index a3470904..97324f4f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a3470904a7c07852307d72ad87129901e6a3506b +Subproject commit 97324f4fc0e5bc5cf27ce6d3c06701f847fd9bfb diff --git a/qtbase b/qtbase index 8005e065..ee7a5a94 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8005e0652c367c5e8c780a298d9fee4ce18a370a +Subproject commit ee7a5a94f9bb0e56053603c6727202af0e851aa4 diff --git a/qtcharts b/qtcharts index 38386fda..a5b0ab93 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 38386fda213cd50e3a3284b69ae15d5f33a7e049 +Subproject commit a5b0ab930e595b7f1e24d5648bdda7872fc7980b diff --git a/qtdeclarative b/qtdeclarative index 1ababa4a..f893d663 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1ababa4a756dc4cc0ae474b15cccfbfa8727e505 +Subproject commit f893d66382549b4d1285ae98b66a1fdd4719036a diff --git a/qtmultimedia b/qtmultimedia index 7bc23038..5b06e7d9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 +Subproject commit 5b06e7d9ea7f423dfee51b296863a11fbd1345e2 diff --git a/qttools b/qttools index c0afdf0f..4ae6d1db 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c0afdf0fdc3c4572ba23bfd6a94e7fd64dd0067d +Subproject commit 4ae6d1db64d29bb3bba07c64dc51606a2c974691 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index adabc870..fa5cd9cc 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit adabc870bc1e60bb57edb6be21471d1c3f83b923 +Subproject commit fa5cd9cc3c6b2579ff1d3ffe32afc00ac6a87835 From e86ba9e1f70be1e28c681a3cf7f685a4d93612cf Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 16 Dec 2016 14:17:04 +0200 Subject: [PATCH 17/22] Provision: Android openssl 1.0.2j for Windows 7 We are currently using too old openssl for Android builds in Windows 7. Openssl version need to be at least 1.0.1. This script will configure openssl 1.0.2j for Android using tools from msys. Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d Reviewed-by: Simon Hausmann --- .../qtci-windows-7-x86/04-msys.ps1 | 14 ++++++++ .../qtci-windows-7-x86/android_openssl.ps1 | 32 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/04-msys.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 new file mode 100644 index 00000000..b75fd2a6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -0,0 +1,14 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install msys which is needed for configuring openssl for Android + +$version = "1.0.11" +$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z" + +$zip = "c:\users\qt\downloads\msys-$version.7z" +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 new file mode 100644 index 00000000..a1b656c6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 @@ -0,0 +1,32 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$destination = "C:\Utils\openssl-android-master" + +Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Remove-Item $destination -Force -Recurse +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr +$env:Path = $env:Path + ";C:\msys\1.0\bin" + +echo "Configuring OpenSSL $version for Android..." +cd $destination +C:\msys\1.0\bin\bash.exe -c "perl Configure shared android" + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h From fc6717cf23f0d0cff04000ac5a69a736d68b9c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 08:51:24 +0200 Subject: [PATCH 18/22] Provision: Install pyside python dependencies to Linux To test successfully pyside dependencies with Coin, we need python-dev packages and virtual env. Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 4 ++++ .../provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 +++++ .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh new file mode 100644 index 00000000..b419f217 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -0,0 +1,4 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh new file mode 100644 index 00000000..ad1bf18f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -0,0 +1,5 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo subscription-manager refresh +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh new file mode 100644 index 00000000..205f598b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -0,0 +1,6 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +sudo apt-get update +sudo apt-get install -y python-dev From ff1ad70a197069ea455cc8c2daaa870e8ec528e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 13 Dec 2016 09:00:12 +0200 Subject: [PATCH 19/22] Provision: Install pyside python dependencies to Windows To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann --- coin/provisioning/common/python.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 39d8146d..32972830 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,3 +62,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package Add-Path $path + +& python -m ensurepip +# Install python virtual env +pip.exe install virtualenv From 8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Dec 2016 10:31:03 +0100 Subject: [PATCH 20/22] Remove shutdown "helpers" for macOS It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh | 8 -------- .../provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh | 8 -------- coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh | 10 ---------- coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh | 8 -------- 4 files changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh deleted file mode 100644 index 73e5efa7..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# OS X 10.8 and VMWare tools don't play well together. -# The shutdown command fails, so just shut down the machine -# manually when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh deleted file mode 100644 index 1f17b545..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Make sure to shut down the machine cleanly when provisioning is done. - -# +1 minute delay to make sure that the setup finishes -# and can clean up before being interrupted by the shutdown - -sudo shutdown -h +1 From 678fcb4e66763a4352e1fe0a1a423d09e38d7a8c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 23 Dec 2016 21:57:49 +0300 Subject: [PATCH 21/22] Updated conan manifests after modification of packages Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba Reviewed-by: Vitaliy Slobodin Reviewed-by: Simon Hausmann --- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 20 +++++++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 13 ++++++------ .../vitallium/stable/export/conanmanifest.txt | 2 +- .../conanmanifest.txt | 16 +++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 20 +++++++++++-------- .../vitallium/stable/export/conanmanifest.txt | 4 ++-- .../conanmanifest.txt | 13 ++++++------ .../vitallium/stable/export/conanmanifest.txt | 2 +- .../conanmanifest.txt | 16 +++++++-------- 12 files changed, 62 insertions(+), 56 deletions(-) rename coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/{ca0c09cfa678fd91b04c82824988c42e9ac40ddf => 08d619707be406a9063a13de35af19767e64a982}/conanmanifest.txt (94%) rename coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/{c85f9b402dd4d46acdf074e1c63b768a41181d7a => c4195ae4643996fbb226d1e0265076354ac622bb}/conanmanifest.txt (94%) diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt index 685e4549..392eb24f 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ -1478098249 -conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file +1482492127 +conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3 diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt similarity index 94% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt rename to coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt index 97af4669..ab1bd501 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt @@ -1,8 +1,10 @@ -1478097969 -bin/icudt57.dll: 87bbc24187330408f9d7cb056060e0ad -bin/icuin57.dll: 10bcbdf7ce17871d7ac0fe560a58493e -bin/icuuc57.dll: 2f252173e83d958205d83e168af27bd1 -conaninfo.txt: 93a147af5e69ef5fc1628b5f401d2e72 +1482491156 +bin/icudt57.dll: 31229bc6cadb43b991620f7d9e9baa06 +bin/icuin57.dll: 3f0eb9f4e2b0e4012afa16f83e9ff0dc +bin/icutest57.dll: ff878466aa02fa1bddfb94ba17b246a8 +bin/icutu57.dll: fef065fefce5fc67ef4a43b666d147d0 +bin/icuuc57.dll: cc8db4d8a1ee20f4e8a46041ef06862f +conaninfo.txt: 13f4fa914f5920b05e5b228be8679454 include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9 include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a @@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863 -lib/icudt.lib: 375f9aff64352ed211a704156f40b206 -lib/icuin.lib: 752c472eb6f90acde3372894a68e2291 -lib/icuuc.lib: 1f493156171786bf782d85ca6ae017bf \ No newline at end of file +lib/icudt.lib: 6ca31dc410effd400636e14cbc616324 +lib/icuin.lib: d3a00a713d384bd66094e2270d98ad2d +lib/icutest.lib: 4ee3e48e551b0f14c992cafd5f5565ba +lib/icutu.lib: d3b931010519ec185efa3b41837f6a72 +lib/icuuc.lib: 209fc74475de9d7244b0780771a4d8ed diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt index c80be750..c958bb87 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ -1478189855 -conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file +1482493404 +conanfile.py: 4c879159bebcecec85173f085cd4c3c7 diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt index 8d769861..e16c2976 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt @@ -1,6 +1,6 @@ -1478189644 -bin/libxml2.dll: 622bde2aec1d514bbf4ffcdcd734dbb7 -conaninfo.txt: a27084d89e21b40687c65926b75cf057 +1482493099 +bin/libxml2.dll: f43264365ba9d2681455ff106303a4e9 +conaninfo.txt: b51d149c110dea2bef2ab37017308696 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41 -include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9 include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/win32config.h: 410df263529fb9ec616b22f590dbdd1d include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: 61e2849cbb7376a17665994d68f7c9b4 -lib/libxml2_a.lib: c4bae1030473a5473ecc77cdf5af397d -lib/libxml2_a_dll.lib: 98c11a0804ff364feb161bfa1214bc63 \ No newline at end of file +lib/libxml2.lib: ec17f6714da6647f63d2cdc54d005e43 +lib/libxml2_a.lib: abae79bdfded67d5017604b7b7c8dd03 +lib/libxml2_a_dll.lib: f68e18d65520175beb3a8de99cbb7e9b diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt index 439e0dbf..be77d721 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ 1478438034 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file +conanfile.py: 2472a82109b2d59062d3e50a54d08a4a diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt index d0ded34a..22a7c428 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt @@ -1,7 +1,7 @@ -1478437844 -bin/libexslt.dll: f57633ce0800d9041ba0040d8fbc9734 -bin/libxslt.dll: 20016a1ea3bc1625cb28e807787d8c93 -conaninfo.txt: 49fd643454ba3c15665b78805623c650 +1482494566 +bin/libexslt.dll: 656ebfef4dcd7d299bff8f5123bfd4b9 +bin/libxslt.dll: cdca16a3183ddcbdf3d0087c3f1e62e9 +conaninfo.txt: 73548fb3ff61aade734c0ce2071a2d05 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 @@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: 424b0512b9a5c474e0f67bc6620b778a -lib/libexslt_a.lib: ae779d86d57ce47bd3f088525126c98a -lib/libxslt.lib: ca7513e26e38cb34f826eee424bafe8f -lib/libxslt_a.lib: 5fcc830c7af32b7b328335b81ef81999 \ No newline at end of file +lib/libexslt.lib: a84716fa57d325856a55cf5ba8a816c6 +lib/libexslt_a.lib: c428937c93542c6386534b61239e8119 +lib/libxslt.lib: 43b2e966367546ff110762f24f4c919d +lib/libxslt_a.lib: a802233763886894a7a89e4f8e634e6a diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt index 685e4549..392eb24f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ -1478098249 -conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file +1482492127 +conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt similarity index 94% rename from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt rename to coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt index e4212811..d2d84a21 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt @@ -1,8 +1,10 @@ -1478098455 -bin/icudt57.dll: 672be38b9176350208e62915e3d22bd7 -bin/icuin57.dll: e14d1d399efb686d4680073ae0452d59 -bin/icuuc57.dll: 9d47b44bd2a382509ffe67c52085467f -conaninfo.txt: 58d139c57d36025b13c7691cc6fe02d6 +1482492365 +bin/icudt57.dll: 9424922f2422576e81509aad8911629d +bin/icuin57.dll: 731ea41a670e4913d4dbeb9cf2fb300d +bin/icutest57.dll: 0103d75f36194e398d8b89c12a6fb6f3 +bin/icutu57.dll: a94d3824640e025353d025a3f50caf10 +bin/icuuc57.dll: 96ecbd9165898f291b3920609ade6096 +conaninfo.txt: 05bf80d930c44b525645a86d8fd1084d include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9 include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a @@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4 include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1 include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6 include/unicode/vtzone.h: 90e065183436be0a94918465f66be863 -lib/icudt.lib: 8feb46831d7f9ff4f851ddb4a3b86287 -lib/icuin.lib: 27e6dd91a18fb61c4e92c5155efec652 -lib/icuuc.lib: cf6f30f41e57d2d7094b450d766a390a \ No newline at end of file +lib/icudt.lib: cf92bb1d1fc1ffea58e7058134fd0f71 +lib/icuin.lib: eca7f889859a2078dba5ae0c228bb45f +lib/icutest.lib: daf163f500ea14d3eafcb2e7885b5f2f +lib/icutu.lib: 6236376ec549a1daba31f7b34cdbb957 +lib/icuuc.lib: f3cfefda92e691c3f81cae2ac3fdff14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt index c80be750..c958bb87 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ -1478189855 -conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file +1482493404 +conanfile.py: 4c879159bebcecec85173f085cd4c3c7 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt index 8df25ad7..4b9ecc61 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt @@ -1,6 +1,6 @@ -1478189807 -bin/libxml2.dll: b86b5aa939f258befbaca3cda811b371 -conaninfo.txt: 1542aee37a2d33374417a5a745c77d0f +1482493354 +bin/libxml2.dll: 0b02196ac933431b150fb73a5bed7518 +conaninfo.txt: 29ccd6acef148fd29fc8ebee20216618 include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087 include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4 include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53 include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29 include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41 -include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9 include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3 include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1 include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/win32config.h: 410df263529fb9ec616b22f590dbdd1d include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72 -lib/libxml2.lib: 814daf6ff042d2110b047da877b075d7 -lib/libxml2_a.lib: c85b4ef8c9e404369a140134a450f98c -lib/libxml2_a_dll.lib: 2cac7d585f12fef63dfbe20f470f2d5e \ No newline at end of file +lib/libxml2.lib: 7ab0a2cf0511ea7eb2593a24e5a31750 +lib/libxml2_a.lib: a4d10046b1cf6910811687a04ef38d6f +lib/libxml2_a_dll.lib: f785611927ed7f3a9514a1ccac31fd10 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt index 439e0dbf..be77d721 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt @@ -1,2 +1,2 @@ 1478438034 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file +conanfile.py: 2472a82109b2d59062d3e50a54d08a4a diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt index f0bffa50..0820b583 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt @@ -1,7 +1,7 @@ -1478437988 -bin/libexslt.dll: bace70c121c29fd8b9e29ce7ea924367 -bin/libxslt.dll: 00022b72c0cacd3c3ca7bc48a0ec4632 -conaninfo.txt: cba36a71cb20255ea805a39e62e79070 +1482494796 +bin/libexslt.dll: acf1f58607eb1a10534cc30ca2bf2c9f +bin/libxslt.dll: 9edc15648704934221ec3afcedb25451 +conaninfo.txt: 224814c47f7d14968c401d2180974e77 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9 include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809 @@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000 include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07 include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9 include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001 -lib/libexslt.lib: c78e77d2bc7ce733a9d45f23176f2803 -lib/libexslt_a.lib: 29b31bece1e69641372cadce020326ad -lib/libxslt.lib: b7d9260d0f7ada29f5d3649820a8e1cb -lib/libxslt_a.lib: e24f546f9b757fd152de506c2d3af1bf \ No newline at end of file +lib/libexslt.lib: 0c9f94aeea183a48ec62d6e1a3ac42af +lib/libexslt_a.lib: 026a42ff0b36660c1bd4890b656c80ee +lib/libxslt.lib: 084d078777bf34d52af7fc93a425d6b0 +lib/libxslt_a.lib: a07434cb5a40a32a17be58f71fe24976 From 7cfb602367b360b37f56fd7ccbf95d9a8f24780e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 24 Dec 2016 20:02:22 +0100 Subject: [PATCH 22/22] Update submodules on '5.8' in qt5 Change-Id: I496fe34b7f81ae099fdb0733f87268ed805df992 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt3d b/qt3d index 97324f4f..e90e10ef 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 97324f4fc0e5bc5cf27ce6d3c06701f847fd9bfb +Subproject commit e90e10efbaaac87cb4f7a642b0b835c6a5f1434d diff --git a/qtactiveqt b/qtactiveqt index b4fc0df8..8fd5468c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b4fc0df834412de5b25b105a2141968d53d37df2 +Subproject commit 8fd5468ca2210d7e6bd515698f264e41368819fd diff --git a/qtbase b/qtbase index ee7a5a94..7957d0fb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ee7a5a94f9bb0e56053603c6727202af0e851aa4 +Subproject commit 7957d0fbd71767055b1fa408d3a05d3892718c84 diff --git a/qtconnectivity b/qtconnectivity index 1750983d..b1e86c68 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1750983d3f053316c735d602c7f9a1b56dc4462b +Subproject commit b1e86c68d1154220a664efebf22e29eeb6a3fe99 diff --git a/qtdatavis3d b/qtdatavis3d index 21c82c7e..27fe1a15 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 21c82c7e0db0a567c11ed80eac955d86ad0e1dff +Subproject commit 27fe1a1564357a13c408a46523c3e18b060a470b diff --git a/qtdeclarative b/qtdeclarative index f893d663..0f911e46 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f893d66382549b4d1285ae98b66a1fdd4719036a +Subproject commit 0f911e46c5ccff88ade99366d7e15e1436360391 diff --git a/qtdoc b/qtdoc index cfc96b57..8867a493 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cfc96b579d3733160ec100bf547562ae59ac2629 +Subproject commit 8867a493aef4de6a409a1b0114a82b5e6045775b diff --git a/qtlocation b/qtlocation index ba9b7b9e..b3422d4a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ba9b7b9ef674d93680070f6c4bb1053d0d2325dd +Subproject commit b3422d4a4460f19d34611f413bea77b332838139 diff --git a/qtmultimedia b/qtmultimedia index 5b06e7d9..38ebe437 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5b06e7d9ea7f423dfee51b296863a11fbd1345e2 +Subproject commit 38ebe4372ca7017b4ed7f477cc6532efcf5fdceb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1bcd068c..b1ea82e4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1bcd068c082b3fab92637686447c2c82b4a0968c +Subproject commit b1ea82e473324ddba0ab2ed2e5e4993b17625436 diff --git a/qtscript b/qtscript index 033eeff8..89ec4f43 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 033eeff87015f6ffa1e6a73dcc6c8a20479511e4 +Subproject commit 89ec4f43b1fd3967fce4efa4b885662328c3f768 diff --git a/qtscxml b/qtscxml index 10bcb2ee..51db93cf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 10bcb2ee73b557a9dfd72143f7bf0b42c607ecaf +Subproject commit 51db93cf783662a155ced91dceef7508ffa955a6 diff --git a/qtserialbus b/qtserialbus index bb999860..f3cb65ad 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit bb999860c46757d9afd6c36fdba11ebe96caccc1 +Subproject commit f3cb65adffa43b337df8f8298091db46c1fbfa24 diff --git a/qttools b/qttools index 4ae6d1db..1ea5035a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4ae6d1db64d29bb3bba07c64dc51606a2c974691 +Subproject commit 1ea5035ad0f663baa3bbc9880a8dd3d4473803e9 diff --git a/qttranslations b/qttranslations index 3ddc1739..31c7540b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06 +Subproject commit 31c7540bdc75d2069ccdb998af51513e3cd71ca6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fa5cd9cc..a4c0385a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fa5cd9cc3c6b2579ff1d3ffe32afc00ac6a87835 +Subproject commit a4c0385a15c29ae56fcad82330699e9058c609e2 diff --git a/qtwayland b/qtwayland index 391c71b4..c9ba2178 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 391c71b4488d69f3a0b16171b01f569fbc9ec07b +Subproject commit c9ba2178388b6a1b68eae69709d989d6d4f19d9b diff --git a/qtwebengine b/qtwebengine index 53d58600..e2609bcb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 53d586000b6ea002d96da0a2cb30d26a61c46635 +Subproject commit e2609bcba621110920d847fcfbaf7edec4ae3827 diff --git a/qtwebkit b/qtwebkit index 67fef930..c6a621db 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 67fef93059ba23812d7390ec7bb8d70f8e7b0492 +Subproject commit c6a621dba39fdcb5d1c05eb5160e59d3ace6e179 diff --git a/qtwebsockets b/qtwebsockets index 5e66a1c5..503a1353 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5e66a1c5d25caef259e6e8b41023004c2b8de355 +Subproject commit 503a1353dcf23f8a5fcb8a2c79d55f707e75cf33