From 8afbd91698c82e0a80a5c913df31001654cf8ff5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 4 Dec 2016 17:58:28 +0200 Subject: [PATCH 01/27] Update submodules on '5.8.0' in qt5 Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index f89a4518..55199c0d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f89a45187fc367d3932ba69cd708263fcaff8356 +Subproject commit 55199c0da68786c2d412c018c875b0c9ae3a3d82 diff --git a/qtandroidextras b/qtandroidextras index 86c02b98..50bc6b85 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 86c02b9839fc9969ac6efb393b7838513955e3ab +Subproject commit 50bc6b85e115df0f89c1e81ab4217e11e18d478f diff --git a/qtbase b/qtbase index 947cace7..6ae9dc3f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 947cace7993807d173656300f4440ae5166624fe +Subproject commit 6ae9dc3f379728a1aaee818a169c03954d6a445c diff --git a/qtcanvas3d b/qtcanvas3d index c8cf923e..5962967a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c8cf923ee5076db1b37fdd012994adf72ce6445e +Subproject commit 5962967a3712ee711fd9ab58da664a3eb0acb24e diff --git a/qtdeclarative b/qtdeclarative index fc5c77e3..53156ddf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fc5c77e371867cf6be8e270e452e21e5ac338283 +Subproject commit 53156ddf3811f27b265213596312ba11a725e062 diff --git a/qtgamepad b/qtgamepad index dc599eca..13bbe6ea 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit dc599eca071d545aab3f6a5c854911cac9585a57 +Subproject commit 13bbe6ea378d127b9b1d70e2858e41e86e754dc7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 661bba4f..cce0aadc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 661bba4f11666d5d9018a6a1d16a71c324bdf123 +Subproject commit cce0aadcd7a15f026c265b23b6e9dbe3310b70b1 diff --git a/qtscxml b/qtscxml index fd91566a..249b698b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit fd91566ac98e300725a161de40a4feba427e1fa8 +Subproject commit 249b698b3963a0207aafc2cf65ce2dd9e5835676 diff --git a/qtsensors b/qtsensors index 07bf3002..1349e430 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 +Subproject commit 1349e430a6202dfe3888413979c594ecd4dc2eea diff --git a/qttools b/qttools index c3b52471..91010f42 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c3b5247161eff3b521381a9ada14b180e330a037 +Subproject commit 91010f426a05232c749843143c26731511fa1cb1 diff --git a/qtwayland b/qtwayland index 545ef2e2..09d75c6d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 545ef2e21d74128733f3b9b117d7c6024826cbb5 +Subproject commit 09d75c6d8e83b3d0682e296357577988abae1b3f diff --git a/qtwebengine b/qtwebengine index a79fd913..265bbb01 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a79fd91391c489ea1cd7baf717778b75e4847b92 +Subproject commit 265bbb01766ca06f64624f20b1396b6a68b59028 diff --git a/qtwinextras b/qtwinextras index ac32e1ed..fff5a724 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ac32e1ed4c5f83dfbef3ee5ac8b8c37852269f85 +Subproject commit fff5a72413864042db8f01ffa86f6b31cc349eee From a6cf19107ca29170b35364c57f899d5d97b2eaf3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 8 Dec 2016 07:16:12 +0200 Subject: [PATCH 02/27] Update submodules on '5.8.0' in qt5 Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index a2c6c81f..08daecb9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a2c6c81f5c67390629a313ff7ba985d0967ca1fa +Subproject commit 08daecb93d275dca62c32f98a7d28ed02bc555e7 diff --git a/qtbase b/qtbase index 6ae9dc3f..4077fcc6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ae9dc3f379728a1aaee818a169c03954d6a445c +Subproject commit 4077fcc6153493284b5e2b0812ff215b49e8c8b7 diff --git a/qtconnectivity b/qtconnectivity index 78c593fc..b6bd4008 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 78c593fcdd9cdfa5804404f2120768544c01c7f5 +Subproject commit b6bd4008c01faa4af6620a1a652a6f88ef3c3a8a diff --git a/qtdeclarative b/qtdeclarative index 53156ddf..e0a3c627 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 53156ddf3811f27b265213596312ba11a725e062 +Subproject commit e0a3c6276a257aeb1cb3ef6d16a4dddcc65d8195 diff --git a/qtdoc b/qtdoc index cfc96b57..b54e186f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cfc96b579d3733160ec100bf547562ae59ac2629 +Subproject commit b54e186ffb0793f314225ec7fd86293c43a9cad7 diff --git a/qtlocation b/qtlocation index ba9b7b9e..41cc3470 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ba9b7b9ef674d93680070f6c4bb1053d0d2325dd +Subproject commit 41cc347040226d2c5c16b9df001d03f2724b87e5 diff --git a/qtnetworkauth b/qtnetworkauth index 35291fa6..ec766338 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 35291fa676359588fedd9b821328e91fff8511e6 +Subproject commit ec7663382bc6382323f3261ab199ec2edbeb5e37 diff --git a/qtscript b/qtscript index dcc9a3fd..c35df2ec 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit dcc9a3fdbf14e14a40bed106a0af93e7134690d4 +Subproject commit c35df2ec0ee05351912e768d298a7c627dbdd1ef diff --git a/qtserialbus b/qtserialbus index fb63280f..b11cf357 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb63280f12042be341df9de55aa94ca23e991fe9 +Subproject commit b11cf357e178aee4b9fa051014e0ec68b7338361 diff --git a/qtsvg b/qtsvg index 51ef7e2e..1b3a7ae1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 +Subproject commit 1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e diff --git a/qtwayland b/qtwayland index 09d75c6d..180c7304 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 09d75c6d8e83b3d0682e296357577988abae1b3f +Subproject commit 180c73044f1cf7c1b464ffd474b218b5a261ff0c diff --git a/qtwebengine b/qtwebengine index 265bbb01..8272b5d1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 265bbb01766ca06f64624f20b1396b6a68b59028 +Subproject commit 8272b5d1082124858b9e16b9df00c9f1dd5d1efa From 0b3ea7ef1b2130b9f97b7b8b85bfee7639269c99 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Dec 2016 11:28:23 +0200 Subject: [PATCH 03/27] Update submodules on '5.8.0' in qt5 Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 08daecb9..f915a9be 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 08daecb93d275dca62c32f98a7d28ed02bc555e7 +Subproject commit f915a9be2e6ccfd1655971edebe2ce13c8c4ab2e diff --git a/qtbase b/qtbase index 4077fcc6..c483945c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4077fcc6153493284b5e2b0812ff215b49e8c8b7 +Subproject commit c483945cf45547d3533674527470788809c79bfb diff --git a/qtconnectivity b/qtconnectivity index b6bd4008..1afb57ed 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6bd4008c01faa4af6620a1a652a6f88ef3c3a8a +Subproject commit 1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee diff --git a/qtdeclarative b/qtdeclarative index e0a3c627..c66e69ef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e0a3c6276a257aeb1cb3ef6d16a4dddcc65d8195 +Subproject commit c66e69efa0b95b3c0220a4ec7e1f6ea72c8a160b diff --git a/qtdoc b/qtdoc index b54e186f..859b5e9b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b54e186ffb0793f314225ec7fd86293c43a9cad7 +Subproject commit 859b5e9bb8eca93cf120965dbf1dd81469fb818e diff --git a/qtscxml b/qtscxml index 249b698b..47042925 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 249b698b3963a0207aafc2cf65ce2dd9e5835676 +Subproject commit 4704292500b98143eee9b0fb0b6a34a858ed1253 diff --git a/qttools b/qttools index 91010f42..2ec70f14 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 91010f426a05232c749843143c26731511fa1cb1 +Subproject commit 2ec70f14f961fdded5a65e68fb510db6fca41b41 diff --git a/qtwayland b/qtwayland index 180c7304..725c71bc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 180c73044f1cf7c1b464ffd474b218b5a261ff0c +Subproject commit 725c71bcb1b5f47e824b45346803250d4a10afdc diff --git a/qtwebengine b/qtwebengine index 8272b5d1..0299ccd3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8272b5d1082124858b9e16b9df00c9f1dd5d1efa +Subproject commit 0299ccd3b9cf50817cce430ec3419c9f204b47e2 From 46d87fb50e4585384de9de514f3e279f14467f5e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 10 Dec 2016 10:24:00 +0200 Subject: [PATCH 04/27] Update submodules on '5.8.0' in qt5 Change-Id: I602ac700f615b32917a16cc368403978869b0c9a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index c483945c..5b895724 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c483945cf45547d3533674527470788809c79bfb +Subproject commit 5b8957247f5e2845dd9f59545ba567d051c4e436 diff --git a/qtdeclarative b/qtdeclarative index c66e69ef..884d06db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c66e69efa0b95b3c0220a4ec7e1f6ea72c8a160b +Subproject commit 884d06db09bc6179baa3add42ff4ef5f3cd0e523 diff --git a/qtquickcontrols b/qtquickcontrols index 84b48cad..201c8639 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 84b48cadc8f68d57d1a750e6aec690f46582e0c5 +Subproject commit 201c86391c7ff78d570fdec6e0c0b71eb1e9aae4 diff --git a/qttools b/qttools index 2ec70f14..4d02101a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2ec70f14f961fdded5a65e68fb510db6fca41b41 +Subproject commit 4d02101ae8d655c9a5e0152857e0edb0a683ebbf diff --git a/qtwebengine b/qtwebengine index 0299ccd3..dc09ed39 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0299ccd3b9cf50817cce430ec3419c9f204b47e2 +Subproject commit dc09ed399219ba6dab7368b04f3946131e8089fd diff --git a/qtwebview b/qtwebview index 5c5c135b..ddc838e9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5c5c135ba8f82161f3e93b367ffacd63dc9111a3 +Subproject commit ddc838e94bffa21289e5c08c7f1fc5b33af674f0 From 6199444cced017f38a6ed3c254f4346eb8a34404 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Dec 2016 10:54:25 +0200 Subject: [PATCH 05/27] Update submodules on '5.8.0' in qt5 Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtsensors | 2 +- qtwebkit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index f915a9be..629de0e3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f915a9be2e6ccfd1655971edebe2ce13c8c4ab2e +Subproject commit 629de0e31253d9c8b388f6f549aa3ad6abf3c630 diff --git a/qtbase b/qtbase index 5b895724..4c0760d3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5b8957247f5e2845dd9f59545ba567d051c4e436 +Subproject commit 4c0760d327e390a37d0d6ce2016d3a8c5b87a119 diff --git a/qtsensors b/qtsensors index 1349e430..1220a31e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1349e430a6202dfe3888413979c594ecd4dc2eea +Subproject commit 1220a31e6c2f91b34b4a05773621dddab8c4315a diff --git a/qtwebkit b/qtwebkit index 67fef930..74ac5b0f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 67fef93059ba23812d7390ec7bb8d70f8e7b0492 +Subproject commit 74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2 From 6c15dc030211680394ce637bb2bf3224bbdca905 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Dec 2016 08:50:57 +0200 Subject: [PATCH 06/27] Update submodules on '5.8.0' in qt5 Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 629de0e3..d4e062ab 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 629de0e31253d9c8b388f6f549aa3ad6abf3c630 +Subproject commit d4e062abfa98285c581c55f42fec590a3815c95f diff --git a/qtbase b/qtbase index 4c0760d3..179045f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4c0760d327e390a37d0d6ce2016d3a8c5b87a119 +Subproject commit 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 diff --git a/qtcharts b/qtcharts index 38386fda..d92de30c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 38386fda213cd50e3a3284b69ae15d5f33a7e049 +Subproject commit d92de30c7c9d56bbbc6f886d8e0a0efce517be60 diff --git a/qtdoc b/qtdoc index 859b5e9b..c757d081 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 859b5e9bb8eca93cf120965dbf1dd81469fb818e +Subproject commit c757d081c35cdca4fa03b750245a2968eda06b2d diff --git a/qtimageformats b/qtimageformats index 65db62e4..cd2de115 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 65db62e4398c5ddfba1ea7825987b3f4ab04369e +Subproject commit cd2de115c6216ad747cf4803e65a4ce4af220795 diff --git a/qtmacextras b/qtmacextras index 844ad02c..145e383d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 844ad02c5d7ba8feec23f51a6338d1a202d6fc60 +Subproject commit 145e383d8108449d5dec8087bb91af5059c661a4 diff --git a/qtmultimedia b/qtmultimedia index 77567bad..544a8a42 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 77567bad82081ffb166578bdeac52fb1f2dce464 +Subproject commit 544a8a4251ff9694780e563ddb6e4af1325e0115 diff --git a/qtpurchasing b/qtpurchasing index e78e73df..bc5b413a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e78e73dfaf46c1a9b5906765ba3665b42a447789 +Subproject commit bc5b413ad027883be123be9e05987805e18f5cb7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cce0aadc..b1e9db69 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cce0aadcd7a15f026c265b23b6e9dbe3310b70b1 +Subproject commit b1e9db69064fb7b30cdc3d9321c81684b2f56090 diff --git a/qtserialbus b/qtserialbus index b11cf357..c8fe92ef 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b11cf357e178aee4b9fa051014e0ec68b7338361 +Subproject commit c8fe92ef54b2d310e8c8c143962fd6f43bf46c27 diff --git a/qtserialport b/qtserialport index 4e667fa7..74aad257 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4e667fa7f88144e198692d9794baacc86bb4eb98 +Subproject commit 74aad2578ecb6739007449a06a54dd7abd64c85b diff --git a/qttools b/qttools index 4d02101a..eaec9b61 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4d02101ae8d655c9a5e0152857e0edb0a683ebbf +Subproject commit eaec9b61d4278297515cc3f7e08b4f08d8b48e2e diff --git a/qttranslations b/qttranslations index 3ddc1739..c0ae29b2 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06 +Subproject commit c0ae29b2328922f16cb2305f8579c2a869c871b0 diff --git a/qtwebchannel b/qtwebchannel index 8cc9153f..e3ddde4b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8cc9153f413c36d505794adfaca4f4724692fa81 +Subproject commit e3ddde4b26a72d57beeeed4e2d3384896e3a399d diff --git a/qtwebengine b/qtwebengine index dc09ed39..aa6294a3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dc09ed399219ba6dab7368b04f3946131e8089fd +Subproject commit aa6294a3918b5e74b549cb483c83371c896a09cc diff --git a/qtwebsockets b/qtwebsockets index 5e66a1c5..afb3c58d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5e66a1c5d25caef259e6e8b41023004c2b8de355 +Subproject commit afb3c58d035db1119666c8556c215187be4f64b8 diff --git a/qtx11extras b/qtx11extras index 177a8090..54cc3158 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 177a8090fbe346ab34040acc60655dcb768ebf4f +Subproject commit 54cc3158acfc75d12338df3b678e013909e66f60 From 5664df0625ec4344d269162adb9383039ff4b0f8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Dec 2016 09:17:02 +0200 Subject: [PATCH 07/27] Update submodules on '5.8.0' in qt5 Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e Reviewed-by: Simon Hausmann --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index d4e062ab..8730660d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d4e062abfa98285c581c55f42fec590a3815c95f +Subproject commit 8730660d83dfa5c4d83a5b86b1892029bda14216 From 2c9249195d92c2d0130a424d9e69e5e79014ab09 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Dec 2016 15:13:09 +0200 Subject: [PATCH 08/27] Update submodules on '5.8.0' in qt5 Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16 Reviewed-by: Antti Kokko --- qtcharts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtcharts b/qtcharts index d92de30c..f191297c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d92de30c7c9d56bbbc6f886d8e0a0efce517be60 +Subproject commit f191297cef751ab55d069fc21284536ceae4ba61 From 10c4c43e52eccf7b8d34b137d3526c75be0686a3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Dec 2016 10:10:23 +0200 Subject: [PATCH 09/27] Update submodules on '5.8.0' in qt5 Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec Reviewed-by: Jani Heikkinen --- qtquickcontrols2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b1e9db69..d0ba7b41 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b1e9db69064fb7b30cdc3d9321c81684b2f56090 +Subproject commit d0ba7b41f27fbfac366930a5e92b80e530b39630 From 40addc7d8141b71b7f580f2e23c0cd4e15e70536 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Jan 2017 08:57:51 +0200 Subject: [PATCH 10/27] Update submodules on '5.8.0' in qt5 Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtcharts | 2 +- qtgraphicaleffects | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 179045f3..f55db673 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 +Subproject commit f55db6738bb5a14ba6ebcfe840225fe9d2ae98c2 diff --git a/qtcharts b/qtcharts index f191297c..225f3fd8 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f191297cef751ab55d069fc21284536ceae4ba61 +Subproject commit 225f3fd89499a5387e1ecaaa29c04bd8a2467042 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 86368278..1583bb55 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 863682782bd7ba3edc33d3e13938437af0637320 +Subproject commit 1583bb5569cfc50141d879107a46146d5ccccf28 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d0ba7b41..a13dce3d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d0ba7b41f27fbfac366930a5e92b80e530b39630 +Subproject commit a13dce3d471c77474ce4b0f6bae115a015139229 diff --git a/qttools b/qttools index eaec9b61..30c10900 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eaec9b61d4278297515cc3f7e08b4f08d8b48e2e +Subproject commit 30c10900adecca55faa1d59c2f0caac74b1f9df6 diff --git a/qtwayland b/qtwayland index 725c71bc..39033d83 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 725c71bcb1b5f47e824b45346803250d4a10afdc +Subproject commit 39033d83bb87632cce43bf89325e24b887803536 diff --git a/qtwebengine b/qtwebengine index aa6294a3..0c745b89 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aa6294a3918b5e74b549cb483c83371c896a09cc +Subproject commit 0c745b89b4da0c12151829905a6f881ad8663e7b diff --git a/qtxmlpatterns b/qtxmlpatterns index 594ad16a..9f7e01b5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 594ad16ae17072a44219228783f2ae051f88eba0 +Subproject commit 9f7e01b582b1bd83cc6b8a854c510871335e2e74 From e47e40eb1cddf14974f47253d06e17108e583bd0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Jan 2017 22:32:58 +0200 Subject: [PATCH 11/27] Update submodules on '5.8.0' in qt5 Change-Id: If96f0ff600589f565235c471fa3380bbe9848914 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 8730660d..440589a0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8730660d83dfa5c4d83a5b86b1892029bda14216 +Subproject commit 440589a0747d9668fec3ff924b390d75be5c6733 diff --git a/qtbase b/qtbase index f55db673..4a738424 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f55db6738bb5a14ba6ebcfe840225fe9d2ae98c2 +Subproject commit 4a738424aaef7958917b92bd64a08eb6208d9c06 diff --git a/qtcharts b/qtcharts index 225f3fd8..057b3e2d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 225f3fd89499a5387e1ecaaa29c04bd8a2467042 +Subproject commit 057b3e2d6a96b42b890a0d007a8801d260c3de48 diff --git a/qtdeclarative b/qtdeclarative index 884d06db..fffb997e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 884d06db09bc6179baa3add42ff4ef5f3cd0e523 +Subproject commit fffb997e192a72b4dcd66edc2fbad5473dd359f3 diff --git a/qtdoc b/qtdoc index c757d081..89b92cee 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c757d081c35cdca4fa03b750245a2968eda06b2d +Subproject commit 89b92ceeb7131b7a6e1e7436b8bacd40ed039c0f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a13dce3d..fc083796 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a13dce3d471c77474ce4b0f6bae115a015139229 +Subproject commit fc083796ad8b02bf9d995ee22b6d60090e1e284d diff --git a/qtwayland b/qtwayland index 39033d83..1bb1eed9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 39033d83bb87632cce43bf89325e24b887803536 +Subproject commit 1bb1eed9ee23f975ee1c132fa77f480fe91352d6 diff --git a/qtwebengine b/qtwebengine index 0c745b89..d740d6a7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c745b89b4da0c12151829905a6f881ad8663e7b +Subproject commit d740d6a7dbfec387752c7bc8a8b06db0e757c9dc From 4cdbf1893f135e2c347e565df7c956508f2157b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Jan 2017 13:12:29 +0200 Subject: [PATCH 12/27] Update submodules on '5.8.0' in qt5 Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e Reviewed-by: Akseli Salovaara --- qtwayland | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwayland b/qtwayland index 1bb1eed9..0e2a9508 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1bb1eed9ee23f975ee1c132fa77f480fe91352d6 +Subproject commit 0e2a950895805457a45abe860bc91a7cc4ba405e From d0bbf98cc9e0992fe14a98079dc8447c68303237 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 11 Jan 2017 20:00:55 +0100 Subject: [PATCH 13/27] Update submodules on '5.6' in qt5 Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02 Reviewed-by: Liang Qi Reviewed-by: Qt CI Bot --- qtbase | 2 +- qtserialport | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 2cfcd8a6..10481cb9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2cfcd8a63e03783b76a36a9f96ff9c754cf06294 +Subproject commit 10481cb9e7066886b9e76a286b66e54a7192a05b diff --git a/qtserialport b/qtserialport index 45c51309..9e4b9d27 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 45c513093c9e7c40327e2c440a0321d99de36211 +Subproject commit 9e4b9d276f0de2d298da4ffdf6f15a9960402194 From 63d77a0b28022d77bb20c59ea2ea57bdfc1ac5ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 13 Jan 2017 12:49:25 +0200 Subject: [PATCH 14/27] Update submodules on '5.8.0' in qt5 Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtquickcontrols2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 4a738424..cfd06918 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4a738424aaef7958917b92bd64a08eb6208d9c06 +Subproject commit cfd069181c01bbade16c173a96100819aa719613 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fc083796..6f7852a3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fc083796ad8b02bf9d995ee22b6d60090e1e284d +Subproject commit 6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1 From 1ba2e086373301bb13db084501c38cb2fcf9fd08 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Jan 2017 20:02:19 +0100 Subject: [PATCH 15/27] Update submodules on '5.8' in qt5 Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebkit | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index abbf2ca1..fc6ffba4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit abbf2ca1aa6f598a0c0c51a4319b911d58f169ab +Subproject commit fc6ffba424bf279cd5e37bec76a7d9589254aac7 diff --git a/qtbase b/qtbase index 8b64f933..635d0ae0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8b64f9336255fa17f1b8e5f337d0e79765512150 +Subproject commit 635d0ae00717b9ba53a8e007e50fac0d2721ca35 diff --git a/qtcharts b/qtcharts index 0a3e9460..a085dc02 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0a3e9460c8a54061a6e858e6e65c4b5ea0a8a093 +Subproject commit a085dc02ea0c9712548ed6babcfce6410adc55d8 diff --git a/qtconnectivity b/qtconnectivity index 2df17b2a..8690dd6d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2df17b2a0c050df98bd87a3dff218096ec84b2fb +Subproject commit 8690dd6d59831206736b3a7839d8d3fd14251362 diff --git a/qtdeclarative b/qtdeclarative index 6746db54..0e3380f9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6746db54f2adb40b836ce41101462bc38604749f +Subproject commit 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd diff --git a/qtdoc b/qtdoc index ff91e32d..846fe070 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff91e32db83c9a2ddce6ed7254f850ddd7a1238c +Subproject commit 846fe070661e97c31feff4d96c2be001740f3e5a diff --git a/qtmultimedia b/qtmultimedia index 23a74e81..c1164f87 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 23a74e810bb2ec4cb950eaae9760889c1e8a5d54 +Subproject commit c1164f874a21959d03893f62db8f8e2def44122d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 00a06264..698cffce 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 00a062649b8aec20c3ac3f61aa72b1cdde43b055 +Subproject commit 698cffce2171bed322aa9d0df1fda316c379efda diff --git a/qttools b/qttools index 980fbea7..b7ccfd3c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 980fbea7adb3d31b8017f844bc8856612d3f7cff +Subproject commit b7ccfd3c107e2edc3823cd79cf67d8e4e34f668b diff --git a/qttranslations b/qttranslations index f9774825..e6099ef4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f97748255437acc0548b9d803467162f39df7a27 +Subproject commit e6099ef43102cab50b2e97f6c9a90f7573793d18 diff --git a/qtwayland b/qtwayland index 5e6259b0..cab7cb98 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5e6259b09326022324709c44ad533d004056e048 +Subproject commit cab7cb98d5b9530a3c265cc2436dd7d157e43f66 diff --git a/qtwebkit b/qtwebkit index a0c60c53..fce06b35 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a0c60c53c0fe1b1f6b5ab52944e031a3684e3de1 +Subproject commit fce06b359971d798474892fad2d56092f27b0f6b From b336c10c08bd7b053a49e06aaa725339d4fb4ea1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 15 Jan 2017 20:02:11 +0100 Subject: [PATCH 16/27] Update submodules on '5.8' in qt5 Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 635d0ae0..7600cb69 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 635d0ae00717b9ba53a8e007e50fac0d2721ca35 +Subproject commit 7600cb6901f515edf6dd712f594927c1b43d61a8 diff --git a/qtcharts b/qtcharts index a085dc02..b238436e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a085dc02ea0c9712548ed6babcfce6410adc55d8 +Subproject commit b238436e27ffa17a470ce2b69f3abe9a13cb14c1 diff --git a/qtdeclarative b/qtdeclarative index 0e3380f9..ec5f3fa6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd +Subproject commit ec5f3fa6b7ddf0ed80801f70add90444f3714593 diff --git a/qtdoc b/qtdoc index 846fe070..de7e0d94 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 846fe070661e97c31feff4d96c2be001740f3e5a +Subproject commit de7e0d947e21155580aa34c009aad2395b1358ff diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 698cffce..537eced6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 698cffce2171bed322aa9d0df1fda316c379efda +Subproject commit 537eced61381f0ce1eabdc797bb0dacd11e11d39 diff --git a/qtwayland b/qtwayland index cab7cb98..52db6d23 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cab7cb98d5b9530a3c265cc2436dd7d157e43f66 +Subproject commit 52db6d23381269f0806377574d08e36aa05fc31a diff --git a/qtwebengine b/qtwebengine index ceff67e0..51d5737f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ceff67e0bab4d34c5b791d1f1b1d43c7a4e44d84 +Subproject commit 51d5737fa45b62ff9fc769cdb8d3a238dbe9d1cb From 43c9b16100d575b02ce38ef100ee344a091444e7 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 15 Jan 2017 20:00:40 +0100 Subject: [PATCH 17/27] Update submodules on '5.6' in qt5 Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtwebsockets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 2c6bd456..600951e6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2c6bd4569878e9248311a7557661304e60a62878 +Subproject commit 600951e6d8a95e172439e347523aab1654c33135 diff --git a/qtwebsockets b/qtwebsockets index d24e9bec..d3032491 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d24e9bec079a5f8c66a372643148fb87bb9fb9f3 +Subproject commit d3032491971e1cee8f1171f16b8e6d3d2fa42eed From ee19f88fe0d1cc1ac28414c691fb5896d98ee242 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Jan 2017 19:23:13 +0200 Subject: [PATCH 18/27] Update submodules on '5.8.0' in qt5 Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index cfd06918..49dc9aa4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cfd069181c01bbade16c173a96100819aa719613 +Subproject commit 49dc9aa409d727824f26b246054a22b5a7dd5980 diff --git a/qtqa b/qtqa index ecdfbf2e..583ae213 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 +Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 From 3e4f86d652aaed9e9c3f254f8066607ccac8adc6 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 18 Jan 2017 20:02:33 +0100 Subject: [PATCH 19/27] Update submodules on '5.8' in qt5 Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index fc6ffba4..4c66cbc2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fc6ffba424bf279cd5e37bec76a7d9589254aac7 +Subproject commit 4c66cbc2bc82f8db0b6d079f1ea48365aa5d5aeb diff --git a/qtbase b/qtbase index 7600cb69..19a1a087 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7600cb6901f515edf6dd712f594927c1b43d61a8 +Subproject commit 19a1a0871d4a9081646925c422fe32e900846c2e diff --git a/qtcharts b/qtcharts index b238436e..52d784e1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b238436e27ffa17a470ce2b69f3abe9a13cb14c1 +Subproject commit 52d784e124c70be3c8185bbd21fcff87db06c2a1 diff --git a/qtconnectivity b/qtconnectivity index 8690dd6d..468e3c38 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8690dd6d59831206736b3a7839d8d3fd14251362 +Subproject commit 468e3c38a893b9293a9f0ede432ce54d72b46966 diff --git a/qtdeclarative b/qtdeclarative index ec5f3fa6..89c6bee1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ec5f3fa6b7ddf0ed80801f70add90444f3714593 +Subproject commit 89c6bee139422b17534f79129eea2820d2ce952e diff --git a/qtdoc b/qtdoc index de7e0d94..ff545591 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit de7e0d947e21155580aa34c009aad2395b1358ff +Subproject commit ff5455912a1a8e40ce9edc731c6c5dcf3a7d9a8e diff --git a/qtlocation b/qtlocation index 9643b177..444a2d5b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9643b177a9c63d97d3854b2ed0325f4b8f4e1df1 +Subproject commit 444a2d5b19e601e74e78384c823d7d048e797c4c diff --git a/qtqa b/qtqa index ecdfbf2e..583ae213 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 +Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 diff --git a/qtquickcontrols b/qtquickcontrols index 08d0ec79..8a223fc0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 08d0ec79897ea2b9ba830f66f8b2ecfbce8723e1 +Subproject commit 8a223fc04e003d93c63dc3c1786da115dd70c7bd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 537eced6..c1b1e9a6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 537eced61381f0ce1eabdc797bb0dacd11e11d39 +Subproject commit c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 diff --git a/qtscxml b/qtscxml index 0a4715a6..c575eb52 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 0a4715a6d2a3bd98eed3ced4d6eeef887c1dd0b6 +Subproject commit c575eb524bc26fc4af3711d634110c226c9e11c0 diff --git a/qttools b/qttools index b7ccfd3c..6eb7f87b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b7ccfd3c107e2edc3823cd79cf67d8e4e34f668b +Subproject commit 6eb7f87bc37eb95d98aaa103a2a20bbfaa408c98 diff --git a/qttranslations b/qttranslations index e6099ef4..1a18f3f3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e6099ef43102cab50b2e97f6c9a90f7573793d18 +Subproject commit 1a18f3f354ba8a769c208abb92a51d7cdfdd9124 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9beed885..5fe45f3b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9beed8859bcf78f5d4cff04be07f1ef52f266881 +Subproject commit 5fe45f3bf60961519b89950e4a91aa14251499fd diff --git a/qtwebengine b/qtwebengine index 51d5737f..4634c246 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 51d5737fa45b62ff9fc769cdb8d3a238dbe9d1cb +Subproject commit 4634c2467875e44a5cae5bc1ce015ca7a8115682 From 07cc7ef71a32f2463bf7ce0d7be1736e65653dc9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 21 Jan 2017 12:31:34 +0100 Subject: [PATCH 20/27] Update submodules on '5.6' in qt5 Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f Reviewed-by: Liang Qi Reviewed-by: Qt CI Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 10481cb9..88e6542e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 10481cb9e7066886b9e76a286b66e54a7192a05b +Subproject commit 88e6542ecc0451df2f291db928c4d4d549aa0ca2 diff --git a/qtdeclarative b/qtdeclarative index 600951e6..533f9591 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 600951e6d8a95e172439e347523aab1654c33135 +Subproject commit 533f9591595c3933ac56a3b3f4422a8aa821cb00 diff --git a/qtqa b/qtqa index ecdfbf2e..583ae213 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 +Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 From 1a3ff2b1af470b44a5804052f5af753d6c97fdc9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 21 Jan 2017 20:02:58 +0100 Subject: [PATCH 21/27] Update submodules on '5.8' in qt5 Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 4c66cbc2..1cbe2c66 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4c66cbc2bc82f8db0b6d079f1ea48365aa5d5aeb +Subproject commit 1cbe2c66d68502cfd84018fd0a38c7abd0a49f95 diff --git a/qtbase b/qtbase index 19a1a087..a828a02d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 19a1a0871d4a9081646925c422fe32e900846c2e +Subproject commit a828a02d9f86b5b1d472768a5a52f963c6ff8175 diff --git a/qtcharts b/qtcharts index 52d784e1..3ee51494 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 52d784e124c70be3c8185bbd21fcff87db06c2a1 +Subproject commit 3ee514949179272c9233754c362ef614970ea0a9 diff --git a/qtdeclarative b/qtdeclarative index 89c6bee1..03505d6e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 89c6bee139422b17534f79129eea2820d2ce952e +Subproject commit 03505d6eb7164298617c1a88979e802d7da12e15 diff --git a/qtserialbus b/qtserialbus index 7408955f..6f8cb585 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7408955f6d44b33403cd6419f8a6452d66ce16a5 +Subproject commit 6f8cb585d14d71fe5f5281794e3b74dffd8fe3df diff --git a/qttools b/qttools index 6eb7f87b..50200d16 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6eb7f87bc37eb95d98aaa103a2a20bbfaa408c98 +Subproject commit 50200d1614f67eacf5606ac7275faa40b20ec312 diff --git a/qtwayland b/qtwayland index 52db6d23..76b0fa5c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 52db6d23381269f0806377574d08e36aa05fc31a +Subproject commit 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b diff --git a/qtwebengine b/qtwebengine index 4634c246..221f83d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4634c2467875e44a5cae5bc1ce015ca7a8115682 +Subproject commit 221f83d34a3dce9f185afe679290d600beb5b81b diff --git a/qtxmlpatterns b/qtxmlpatterns index b7f8783f..82c5cc65 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b7f8783f25cf1ff0eadbab59701acd46bff58e9a +Subproject commit 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 From 84ed87b4962cc1811e076b62781dbae28124d728 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Jan 2017 20:02:27 +0100 Subject: [PATCH 22/27] Update submodules on '5.8' in qt5 Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 1cbe2c66..f53de9d4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1cbe2c66d68502cfd84018fd0a38c7abd0a49f95 +Subproject commit f53de9d4180ef716455d368558d3cb0898cf2b1b diff --git a/qtbase b/qtbase index a828a02d..79352528 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a828a02d9f86b5b1d472768a5a52f963c6ff8175 +Subproject commit 79352528a1726b4551ea4d9285dd2394dd0d43da diff --git a/qtcharts b/qtcharts index 3ee51494..382f5ccd 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3ee514949179272c9233754c362ef614970ea0a9 +Subproject commit 382f5ccd4c7d4d76380f15cab2f019b9683ebc1f diff --git a/qtdeclarative b/qtdeclarative index 03505d6e..f1c37497 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 03505d6eb7164298617c1a88979e802d7da12e15 +Subproject commit f1c37497238be8960a5408fc3b7abc65c3774061 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c1b1e9a6..29c0ac9a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 +Subproject commit 29c0ac9a950d063e627a077189b33aaf4810cf89 diff --git a/qtscript b/qtscript index cec2c4c5..9cd0730a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit cec2c4c5fbcc75a990cfc529f2174e0df26b0b2d +Subproject commit 9cd0730ab10e6fe8244270bec16fe8bbde3dee82 diff --git a/qtserialbus b/qtserialbus index 6f8cb585..9fc56b2a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6f8cb585d14d71fe5f5281794e3b74dffd8fe3df +Subproject commit 9fc56b2a388efcfc343295443956d8e268bffee4 diff --git a/qttools b/qttools index 50200d16..fe23614c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 50200d1614f67eacf5606ac7275faa40b20ec312 +Subproject commit fe23614c7a502b7d89845b554c82bf4acd805ed9 diff --git a/qttranslations b/qttranslations index 1a18f3f3..c7d1706b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1a18f3f354ba8a769c208abb92a51d7cdfdd9124 +Subproject commit c7d1706b512649b4037421aa8f0c119efd23c93a diff --git a/qtwayland b/qtwayland index 76b0fa5c..f72d6386 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b +Subproject commit f72d63866d3f5820865fcd309b649dc9932518ee diff --git a/qtwebengine b/qtwebengine index 221f83d3..b2108335 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 221f83d34a3dce9f185afe679290d600beb5b81b +Subproject commit b21083353a224d1a183f28b970abc8be56649da1 From eeea4e5c3a8e5adb78ad08fcbf6b133d98fa072c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Sep 2016 09:17:07 +0300 Subject: [PATCH 23/27] Add Android NDK/SDK to provision for macOS 10.10 and 10.11 Install latest Android sdk and ndk. It also runs update for SDK API level 18 Task-number: QTBUG-58370 Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3 Reviewed-by: Simon Hausmann --- .../common/01-macos-removethemall.sh | 49 +++++++++ .../01-macos-removethemall.sh | 4 + .../qtci-osx-10.10-x86_64/android.sh | 102 ++++++++++++++++++ .../qtci-osx-10.10-x86_64/crashreporter.sh | 2 + .../01-macos-removethemall.sh | 4 + .../qtci-osx-10.11-x86_64/android.sh | 102 ++++++++++++++++++ .../qtci-osx-10.11-x86_64/crashreporter.sh | 2 + 7 files changed, 265 insertions(+) create mode 100644 coin/provisioning/common/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/android.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/android.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/01-macos-removethemall.sh new file mode 100644 index 00000000..f0e26480 --- /dev/null +++ b/coin/provisioning/common/01-macos-removethemall.sh @@ -0,0 +1,49 @@ +#!/bin/sh +############################################################################# +## +## 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 RemoveDir { + param=$1 + + if [ ! -d $param ] + then + echo "'$param' don't exists" + else + echo "Removing $param..." + sudo rm -fr $param + fi +} + +# Remove Android +param="/opt/android" +RemoveDir $param diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh new file mode 100644 index 00000000..6b56aac4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +source "$BASEDIR/../common/01-macos-removethemall.sh" + diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh new file mode 100644 index 00000000..559eabd6 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Android sdk and ndk. + +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and - build-tools + +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkVersion="android-sdk_r24.4.1-macosx.zip" +sdkBuildToolsVersion="24.0.2" +sdkApiLevel="android-18" +sdkUrl="$baseUrl/$sdkVersion" +sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" +sdkTargetFile="$targetFolder/$sdkVersion" +sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkFolderName="android-sdk-macosx" +sdkName="sdk" + +# NDK +ndkVersion="android-ndk-r10e-darwin-x86_64.zip" +ndkUrl="$baseUrl/$ndkVersion" +ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkTargetFile="$targetFolder/$ndkVersion" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-r10e" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" + shasum $targetFile |grep $sha1 || echo "shasum check failed !" + sudo chmod 755 $targetFile + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:wheel $targetFolder/$folderName + sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" + sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" +} + +sudo mkdir $targetFolder +# Install Android SDK +echo "Installing Android SDK version $sdkVersion..." +InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkVersion..." +InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName + +# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." +echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" + +# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 +# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. +echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh new file mode 100644 index 00000000..6b56aac4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +source "$BASEDIR/../common/01-macos-removethemall.sh" + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh new file mode 100644 index 00000000..559eabd6 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Android sdk and ndk. + +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and - build-tools + +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkVersion="android-sdk_r24.4.1-macosx.zip" +sdkBuildToolsVersion="24.0.2" +sdkApiLevel="android-18" +sdkUrl="$baseUrl/$sdkVersion" +sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" +sdkTargetFile="$targetFolder/$sdkVersion" +sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkFolderName="android-sdk-macosx" +sdkName="sdk" + +# NDK +ndkVersion="android-ndk-r10e-darwin-x86_64.zip" +ndkUrl="$baseUrl/$ndkVersion" +ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkTargetFile="$targetFolder/$ndkVersion" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-r10e" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" + shasum $targetFile |grep $sha1 || echo "shasum check failed !" + sudo chmod 755 $targetFile + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:wheel $targetFolder/$folderName + sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" + sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" +} + +sudo mkdir $targetFolder +# Install Android SDK +echo "Installing Android SDK version $sdkVersion..." +InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkVersion..." +InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName + +# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." +echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" + +# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 +# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. +echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server From 3276f075b9649489d0d61fe624e3e8efac6e30ea Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 19 Jan 2017 11:49:24 +0200 Subject: [PATCH 24/27] Provision: Set bash_profile to read .bashrc The method (vmware tools) of launching a process inside a virtual machine results in the launch of a process that does not originate from a login shell. Therefore the CI system explicitly starts the agent with "bash -l -c" to enforce the invocation as login shell and thus execute settings from /etc/profile, ~/.bash_profile, etc. This brings the behavior of the system closer to what we see as developers. However the shell is a non-interactive shell, therefore ~/.bashrc is not read by default. On Linux systems such as RHEL, ~/.bash_profile is configured to still read ~/.bashrc. For consistency we apply the same logic to the macOS configurations. Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh | 5 +++++ coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh new file mode 100644 index 00000000..0fbe7628 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh new file mode 100644 index 00000000..0fbe7628 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + From 18967fce7d6165eb73b7813ec9a26055d7d0ea71 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 25 Jan 2017 19:29:52 +0100 Subject: [PATCH 25/27] Update submodules on '5.8' in qt5 Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index f53de9d4..40f60c66 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f53de9d4180ef716455d368558d3cb0898cf2b1b +Subproject commit 40f60c66ab538229f4f64ea8f56682ae33c5926c diff --git a/qtactiveqt b/qtactiveqt index b36beaa4..555527b6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b36beaa453fb855e943205ad28155e1b120c364a +Subproject commit 555527b6992374f8a5139674a316e819f9d5685f diff --git a/qtbase b/qtbase index 79352528..19529832 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 79352528a1726b4551ea4d9285dd2394dd0d43da +Subproject commit 195298326f0d8aa75e7034a11c13060b81435855 diff --git a/qtcharts b/qtcharts index 382f5ccd..ac91bf79 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 382f5ccd4c7d4d76380f15cab2f019b9683ebc1f +Subproject commit ac91bf7984291f46619415213ce089a33fc3e597 diff --git a/qtdeclarative b/qtdeclarative index f1c37497..9aed949b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f1c37497238be8960a5408fc3b7abc65c3774061 +Subproject commit 9aed949bb99b9bf328322457a02ad1a9fb330f2d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 29c0ac9a..f0ce8b84 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 29c0ac9a950d063e627a077189b33aaf4810cf89 +Subproject commit f0ce8b847e2169ad4ae884dbb35b58e6dd0f1859 diff --git a/qtserialbus b/qtserialbus index 9fc56b2a..6cb07fb5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9fc56b2a388efcfc343295443956d8e268bffee4 +Subproject commit 6cb07fb512082bac7df5b50048d7ade111b575e0 diff --git a/qtspeech b/qtspeech index 483208af..9bfe64fd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 483208aff4f583df2c9c14d0d549c39d68481196 +Subproject commit 9bfe64fddcc528e9aa27b33a17e1435f46ec620d diff --git a/qttools b/qttools index fe23614c..6df9249f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fe23614c7a502b7d89845b554c82bf4acd805ed9 +Subproject commit 6df9249f080f7109d87caa450f2434ad1136010b diff --git a/qtwebengine b/qtwebengine index b2108335..eb556918 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b21083353a224d1a183f28b970abc8be56649da1 +Subproject commit eb5569186b126e7ffc507a14efd502fac32f7fb9 diff --git a/qtwebkit b/qtwebkit index fce06b35..dcf0d42f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit fce06b359971d798474892fad2d56092f27b0f6b +Subproject commit dcf0d42f3de04c01ff6bfedf1a2ded863b134268 diff --git a/qtwinextras b/qtwinextras index a8bd3176..9305a4e5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a8bd317652bf44d37ba97033f8c24b64fbae6419 +Subproject commit 9305a4e5db9ce26db9a2510f5230636122d98ffe From 98fa30e28e12fcf6ea27d9932c0549c0d648513f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 27 Jan 2017 08:51:44 +0100 Subject: [PATCH 26/27] Update submodules on '5.8' in qt5 Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qt3d b/qt3d index 40f60c66..8ec785d2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 40f60c66ab538229f4f64ea8f56682ae33c5926c +Subproject commit 8ec785d21c13ed0a8d375ff13bf06bea1deb11ae diff --git a/qtactiveqt b/qtactiveqt index 555527b6..1ef04fed 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 555527b6992374f8a5139674a316e819f9d5685f +Subproject commit 1ef04fedc0230450a8588bcb2ac6069693a03360 diff --git a/qtandroidextras b/qtandroidextras index c9175b82..d94fb02a 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c9175b821526a94300f16770cadbd88a0f73acd9 +Subproject commit d94fb02a55705ba913fcf4f871528ea8aee52eaa diff --git a/qtbase b/qtbase index 19529832..02cc57f4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 195298326f0d8aa75e7034a11c13060b81435855 +Subproject commit 02cc57f4edbae450ecfa8368052afa44f8aeee19 diff --git a/qtcanvas3d b/qtcanvas3d index 2041335c..a50cb912 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2041335c66a20820d55b26368e0c86d6de5d478a +Subproject commit a50cb9128477474932fc5761e30226582deaf6b1 diff --git a/qtdeclarative b/qtdeclarative index 9aed949b..e0c119cc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9aed949bb99b9bf328322457a02ad1a9fb330f2d +Subproject commit e0c119ccd4ca49b6fecb708133bb0d3008903560 diff --git a/qtgamepad b/qtgamepad index 2c55174f..72be0422 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2c55174f267fccdd6bf74171b0da312f895c5a62 +Subproject commit 72be0422f98cdcfa09b7aa019ce51ac473569db5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 254be077..8e1f0eca 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 254be077bc20f4eb68cc4cc3e44eab8d20cd4f55 +Subproject commit 8e1f0ecad3fdb93b80663ea3fad7013eeb424500 diff --git a/qtimageformats b/qtimageformats index 0870e670..8f045f41 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0870e670665a702665948723bb7b1eb61a9572a8 +Subproject commit 8f045f413e935ef9e7fdcef55c52343686a0f1aa diff --git a/qtlocation b/qtlocation index 444a2d5b..8cbfb416 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 444a2d5b19e601e74e78384c823d7d048e797c4c +Subproject commit 8cbfb416c6cb1f60a7035d810f3ed68d3aae7bac diff --git a/qtmacextras b/qtmacextras index 733d54a6..56ca83ad 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 733d54a6a9522b31c38c973690c3df24d033c805 +Subproject commit 56ca83adf83cecd3b81425973d3bb65715719b80 diff --git a/qtmultimedia b/qtmultimedia index c1164f87..e5ee1e03 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c1164f874a21959d03893f62db8f8e2def44122d +Subproject commit e5ee1e036eaecb91797cbe85ac7f8929145f3d65 diff --git a/qtnetworkauth b/qtnetworkauth index 591fe512..1f5d0bbc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 591fe512e3a65877441b4adbf51f388dc4991e7e +Subproject commit 1f5d0bbcf5a581a67aad97564fb696f180462967 diff --git a/qtpurchasing b/qtpurchasing index e46edb68..10902d98 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e46edb689a634a2559e867c67f51a00ffc562091 +Subproject commit 10902d9809e1df9be58d7408c0aceeef8a621b2d diff --git a/qtquickcontrols b/qtquickcontrols index 8a223fc0..27da25e2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8a223fc04e003d93c63dc3c1786da115dd70c7bd +Subproject commit 27da25e24ed44008f7ba303bb7fe8291aa43fd14 diff --git a/qtscript b/qtscript index 9cd0730a..d9d0f0fb 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9cd0730ab10e6fe8244270bec16fe8bbde3dee82 +Subproject commit d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef4 diff --git a/qtsensors b/qtsensors index 04c42632..1b880496 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 04c42632315ee4e9ac22003b572d4877fcbd33f9 +Subproject commit 1b88049661176d149fa75bfdc349cf5b7acb21b4 diff --git a/qtserialbus b/qtserialbus index 6cb07fb5..aef65fb8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6cb07fb512082bac7df5b50048d7ade111b575e0 +Subproject commit aef65fb80fc60909ac5141f2df1f9918f964528c diff --git a/qtserialport b/qtserialport index f6405215..86683c44 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f640521532087dc76d36b25a6c49b2f64afcd4de +Subproject commit 86683c445aa61d23af5c06f4e4b45c1d4c80a5bd diff --git a/qtsvg b/qtsvg index 5f5b5f58..9778bdd2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5f5b5f58a976825c883a772d19beac21aaf4dd1d +Subproject commit 9778bdd27ce04b92824abfc1bb54b21f1086a2f6 diff --git a/qttools b/qttools index 6df9249f..7bb45dc5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6df9249f080f7109d87caa450f2434ad1136010b +Subproject commit 7bb45dc5318c4c84d94ff35400616eee8e7f741d diff --git a/qtwayland b/qtwayland index f72d6386..df015bd2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f72d63866d3f5820865fcd309b649dc9932518ee +Subproject commit df015bd2e40e7654b2515996d5bd82469542581a diff --git a/qtwebchannel b/qtwebchannel index 87d83df5..031d8d8b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 87d83df5f3fa2a582385e70dc22c4a9789134f99 +Subproject commit 031d8d8b1c150f464fc29f7c7a296d257b19797a diff --git a/qtwebengine b/qtwebengine index eb556918..35c38346 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit eb5569186b126e7ffc507a14efd502fac32f7fb9 +Subproject commit 35c38346e65fe26c75bbe08c7002f645ea53fec1 diff --git a/qtwebkit b/qtwebkit index dcf0d42f..7c082434 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit dcf0d42f3de04c01ff6bfedf1a2ded863b134268 +Subproject commit 7c0824348f93947c946a42999afd8b5dd329c519 diff --git a/qtwebsockets b/qtwebsockets index 670266a0..83a05bbd 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 670266a075c7c312c6a7f9465298bfec0b968ee2 +Subproject commit 83a05bbdc5d87246ec089f855545b6836c0fdf38 diff --git a/qtwebview b/qtwebview index 241fe52a..801760d3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 241fe52ae9531f7fad0a5ca1af0bda5a1e5724c7 +Subproject commit 801760d37833f33b0395e610755de9910b65cafd diff --git a/qtwinextras b/qtwinextras index 9305a4e5..f7239c69 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 9305a4e5db9ce26db9a2510f5230636122d98ffe +Subproject commit f7239c69779e7c9e612a6b3ddb0ae1479d2bd5c2 diff --git a/qtx11extras b/qtx11extras index 3cb215e9..66191eb5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 3cb215e9b988795d6222c9dac38e1a12d00ba838 +Subproject commit 66191eb5d4f41083919d1fce4f1d4ab15bb1a143 diff --git a/qtxmlpatterns b/qtxmlpatterns index 82c5cc65..2e582640 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 +Subproject commit 2e582640c06facd313d77b34fe40c9db4419eef5 From d4681ee6906f441d072df6e060599e6d7741d5a4 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 25 Jan 2017 10:12:36 +0200 Subject: [PATCH 27/27] Android sdk and ndk to provisioning for Windows 7 Installs latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Task-number: QTBUG-58369 Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c Reviewed-by: Simon Hausmann --- .../common/01-windows_removethemall.ps1 | 5 ++ coin/provisioning/common/memorypershell.ps1 | 3 + .../qtci-windows-7-x86/02-memorypershell.ps1 | 1 + .../qtci-windows-7-x86/06-android.ps1 | 65 +++++++++++++++++++ ...oid_openssl.ps1 => 07-android_openssl.ps1} | 0 5 files changed, 74 insertions(+) create mode 100644 coin/provisioning/common/memorypershell.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/06-android.ps1 rename coin/provisioning/qtci-windows-7-x86/{android_openssl.ps1 => 07-android_openssl.ps1} (100%) diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1 index 8285ddae..9e64a34d 100644 --- a/coin/provisioning/common/01-windows_removethemall.ps1 +++ b/coin/provisioning/common/01-windows_removethemall.ps1 @@ -59,3 +59,8 @@ Function Remove-Path { Remove C:\Python27 Remove-Path C:\python27\scripts Remove-Path C:\python27 + +# Remove Android sdk and ndk +Remove C:\utils\android* +[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") +[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User") diff --git a/coin/provisioning/common/memorypershell.ps1 b/coin/provisioning/common/memorypershell.ps1 new file mode 100644 index 00000000..2a8ebb68 --- /dev/null +++ b/coin/provisioning/common/memorypershell.ps1 @@ -0,0 +1,3 @@ +# This is needed e.g. for Android NDK installation for Windows 7 x86 +echo "Increase value of MaxMemoryPerShellMB to avoid 'out of memory' exception" +set-item wsman:localhost\Shell\MaxMemoryPerShellMB 2048 diff --git a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 new file mode 100644 index 00000000..ba24f9d7 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\memorypershell.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 new file mode 100644 index 00000000..96be39a3 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 @@ -0,0 +1,65 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs Android sdk and ndk +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g the bluetooth features that require Android 18 will disable themselves dynamically when running on Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +# NDK +$ndkVersion = "r10e" +$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" +$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" +$ndkFolder = "c:\utils\android-ndk-$ndkVersion" +$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" + +# SDK +$sdkVersion = "r24.4.1" +$sdkApi = "ANDROID_API_VERSION" +$sdkApiLevel = "android-18" +$sdkBuildToolsVersion = "23.0.3" +$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip" +$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" +$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" +$sdkFolder = "c:\utils\android-sdk-windows" +$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip" + +function Install($1, $2, $3, $4) { + $cacheUrl = $1 + $zip = $2 + $checksum = $3 + $offcialUrl = $4 + + Download $offcialUrl $cacheUrl $zip + Verify-Checksum $zip "$checksum" + Extract-Zip $zip C:\Utils +} + +function SdkUpdate ($1, $2) { + echo "Running Android SDK update for $1..." + cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2" +} + +echo "Installing Android ndk $nkdVersion" +Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl +echo "Set environment variable ANDROID_NDK_HOME=$ndkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkFolder, "Machine") +echo "Set environment variable ANDROID_NDK_ROOT=$ndkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkFolder, "Machine") + +#echo "Installing Android sdk $sdkVersion" +Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl +echo "Set environment variable ANDROID_SDK_HOME=$sdkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME", $sdkFolder, "Machine") +echo "Set environment variable ANDROID_API_VERSION $sdkApiLevel" +[Environment]::SetEnvironmentVariable("ANDROID_API_VERSION", $sdkApiLevel, "Machine") + +# SDK update +SdkUpdate $sdkFolder $sdkApiLevel +SdkUpdate $sdkFolder tools +SdkUpdate $sdkFolder platform-tools +SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion + +# kill adb. This process prevent's provisioning to continue +taskkill /im adb.exe /f diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 rename to coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1