From 29456af9b9388dfd282e4f5d67597058e41f8b97 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Feb 2018 19:48:04 +0100 Subject: [PATCH 01/25] Update submodules on '5.10.1' in qt5 Change-Id: I00b96bfb3f93027136a770a25c7479b1902bcde4 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qtsvg | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index e2e162b9..1360f39a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e2e162b9ca122e68c444b536888f30c6f1c10de4 +Subproject commit 1360f39aa811df96c2762cf081702f7a86a782cd diff --git a/qtbase b/qtbase index e39a9de3..69d2501e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e39a9de3309f84be4101da839a0bacf69090706f +Subproject commit 69d2501ee1900c43a35802eae05a734e479a7776 diff --git a/qtconnectivity b/qtconnectivity index b274a83b..39a7ba2d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c +Subproject commit 39a7ba2d666c52c3dd732483619cadf6b7a49d60 diff --git a/qtdatavis3d b/qtdatavis3d index 63b90a1d..4ceabb63 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 63b90a1d334743b63f396331434e9b12e366f9d3 +Subproject commit 4ceabb63a6db137809a08cab11d10b0b0df5d411 diff --git a/qtdeclarative b/qtdeclarative index 2570b801..598a5dd8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2570b801c74832a3c83a8b56ad0f76812969e190 +Subproject commit 598a5dd899e7c3cc77441baeff2630608ffde89a diff --git a/qtlocation b/qtlocation index 9283a290..518633da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9283a290040fd55f7eb34580b99f771d4facdeb4 +Subproject commit 518633da419d6cfaf603773b9e8c5840e783bc4a diff --git a/qtmultimedia b/qtmultimedia index a3fb2426..0a71cf73 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a3fb242676055355deb68788199ae59abe58ca41 +Subproject commit 0a71cf73f1d5cad5b45972a51c4680b55671470e diff --git a/qtsensors b/qtsensors index fb382442..5b5a7b4d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fb382442ccf1a8e926687b3cfa163ccbca479c46 +Subproject commit 5b5a7b4d1f49960d2b7b80735bd4eb6340b1acf0 diff --git a/qtsvg b/qtsvg index 275bd8a4..520ebdba 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f +Subproject commit 520ebdbacb3b0d823126d82306107808287425a3 diff --git a/qtwebengine b/qtwebengine index d502c6e9..c309e309 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d502c6e9d09803dd268100f8c53cf7bc563e3d1d +Subproject commit c309e309ef2a7ec0fd56e1dd9ced4bcabacb5976 diff --git a/qtxmlpatterns b/qtxmlpatterns index 0a84ad44..3585d226 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0a84ad44ff5b793316485fd992326627a70fda84 +Subproject commit 3585d2269ba2d9777e3afccef026d1e159f47f5d From 88811f882e48b4f03d54224b7eff3fe28213e856 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 2 Feb 2018 17:29:56 +0200 Subject: [PATCH 02/25] Update submodules on '5.9' in qt5 Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index 02ebfda6..ceae7436 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 02ebfda6c3aaedd2becdc4f0ce4a39025e95b726 +Subproject commit ceae743678d41a58154612781e896c04c87a8c4f diff --git a/qtactiveqt b/qtactiveqt index 15c9ffc2..d895e5d8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 15c9ffc20f205e32b9297249be944bcbedd84fc7 +Subproject commit d895e5d8f11afb1b4fef7d4962490146c7c251ce diff --git a/qtandroidextras b/qtandroidextras index cd6fc729..aa7acf47 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cd6fc729f32ed01ec52b7aad4be463c8161240bf +Subproject commit aa7acf474f58c0c33666386493f867aead8a853e diff --git a/qtbase b/qtbase index 4cd90a35..b7e43673 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4cd90a3579986ae7441c3e982a5f34cdfd92c152 +Subproject commit b7e436738756b1d5d7a45201b7a7204d7fe128a1 diff --git a/qtcanvas3d b/qtcanvas3d index e8c0f4eb..08b2b003 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit e8c0f4eb3e3ffebad02eee7b6bfecf0a3c573f1d +Subproject commit 08b2b0033d734710ced9050e71a79e094257462a diff --git a/qtcharts b/qtcharts index a2eb6b3b..31127e1f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a2eb6b3b15e19d5c8215c41694ce8c74918cb58a +Subproject commit 31127e1f2926c3f2d3c25060b1c3e3a8cf9e6950 diff --git a/qtconnectivity b/qtconnectivity index df376c4c..234907ae 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit df376c4c27d16f70ba69925553acfc69287b269a +Subproject commit 234907ae5fc3dd5b9e5c3b0fa76d65f986104a27 diff --git a/qtdatavis3d b/qtdatavis3d index 172dbad2..8bfa8a8e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 172dbad2db094148323fd8a9e6ab44c72a9fa88e +Subproject commit 8bfa8a8ef3500744e1c26e1a82391186c44812ef diff --git a/qtdeclarative b/qtdeclarative index 922ce0ef..6958308c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 922ce0ef39302a8d6d306a09295cbae857becbc4 +Subproject commit 6958308c09ceda855a30c5a2d491f078c5104071 diff --git a/qtdoc b/qtdoc index b5d003d0..81d8e665 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b5d003d00c114a6824ef45bee027a72e309fc009 +Subproject commit 81d8e665204ed6b9facabf5d170dd91acc06c36c diff --git a/qtgamepad b/qtgamepad index d252eb8a..da6d567a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit d252eb8ae4f99a5ad193662a493aa17044aef434 +Subproject commit da6d567a54292f2c6c2f43af647b576be8c9a8f0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ddee9ff8..8e86608f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ddee9ff8217d307b962c033ea632bfe3ef683acc +Subproject commit 8e86608f28b168b6a0e7ee5dbd56ec7d2e55b09b diff --git a/qtimageformats b/qtimageformats index 3c607b32..00e422c3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3c607b324ffbf84ce9803d80a04c7d663e847496 +Subproject commit 00e422c39b3c190acbf5609247a4172b45281d15 diff --git a/qtlocation b/qtlocation index 68b5ee9e..66ba05c8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c +Subproject commit 66ba05c88524023012efdb76d54d48f47411a5a4 diff --git a/qtmacextras b/qtmacextras index 5e0178d3..970a1017 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5e0178d350c3f59fe327b5a5c89beb4f48efca2f +Subproject commit 970a10176cc6f43e1fa78883bbd7e27ea1100b26 diff --git a/qtmultimedia b/qtmultimedia index f4ed0d41..fb477cdb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f4ed0d4178ecdf50cdaca47716a5101a28494157 +Subproject commit fb477cdb126848e416845df348ca4031ccc2f87b diff --git a/qtnetworkauth b/qtnetworkauth index eee494c1..e62fdc98 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit eee494c12a70fa0aa6fce427f47f44ff60281dca +Subproject commit e62fdc9887d4bdc2d1cfd07c918dd15cd1992baf diff --git a/qtpurchasing b/qtpurchasing index 34796716..a58433b7 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 3479671699f5a6cb13e002762dc35398b66066fd +Subproject commit a58433b78f0b06a1f0594e9fcee9601e0170fdc4 diff --git a/qtquickcontrols b/qtquickcontrols index a8438846..93c5dc8b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a843884697602891d21b9f9bc62603548dd6a6b8 +Subproject commit 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c3858bd5..223c1524 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c3858bd53974e486e03537d1937deb0020828556 +Subproject commit 223c1524a7693e2c0f2312dd738c6aeb484358a5 diff --git a/qtremoteobjects b/qtremoteobjects index 286f3c62..dc2a2777 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 286f3c626087635cb24708b8e42b1d8af0401640 +Subproject commit dc2a27771daefefe746310fd25aa06f716df0976 diff --git a/qtscript b/qtscript index 8399cdfb..36e82de4 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 8399cdfbaf2aceab9c22fdcb10d2369ddb39b5df +Subproject commit 36e82de4386aed1fcc9b24b944e01d807a0f709f diff --git a/qtscxml b/qtscxml index 86983e53..0d610556 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 86983e533aec1cf1095fec643dc6b1b9029fd456 +Subproject commit 0d6105563d5e53356dfdae64bcb19a1e8e4db6b8 diff --git a/qtsensors b/qtsensors index 01186d63..dcc4d0b5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 01186d63a0e585d6eb432271371dd3cd489dc905 +Subproject commit dcc4d0b58a4fe0432d3ac86f1f2bd132e40be424 diff --git a/qtserialbus b/qtserialbus index 81b1ae51..38c64b11 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 81b1ae518792a9c1a2417c3a05b87eb5dc7ebc13 +Subproject commit 38c64b11c9538ec9e5c880bfa84a56630c7f2ae7 diff --git a/qtserialport b/qtserialport index c0bdb69f..6f62e9de 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c0bdb69f432117e9119866bd610aea87d3eb4ee1 +Subproject commit 6f62e9de520a50a7bc90241d4a5d2c385a25373f diff --git a/qtspeech b/qtspeech index 16ab9c26..fd6648b0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 16ab9c262b1d53222913da96f7a14485e3ef0836 +Subproject commit fd6648b0b77dc628e89655f5dc271dbc42ca829c diff --git a/qtsvg b/qtsvg index 74eb2d7d..a2156af9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 74eb2d7d0268492c95779cb6029393aa1de67e05 +Subproject commit a2156af9ed6bc3e57f715dfe6784a2249ee5fa35 diff --git a/qttools b/qttools index f1233878..21f39607 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f1233878fef715c0746dcb6af7164acfb46fd418 +Subproject commit 21f3960738bf73e4663bde5108d8859367efb66f diff --git a/qttranslations b/qttranslations index b3684346..97a0f2e1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b3684346bd60983cecf2524f9f8081df514b5cb0 +Subproject commit 97a0f2e132983018473886eb1e3f5ac761839c6e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 34123d6d..88be503a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 34123d6db47e213a66e855d8895030a2a5979c0b +Subproject commit 88be503aa376a906fa003c5e89d45c47c69d8ca4 diff --git a/qtwayland b/qtwayland index 9f1db9d0..79cde9fb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9f1db9d0ae60ffe8be1453a57be3b8f2861e4882 +Subproject commit 79cde9fba8452afba049f4fd611dfe9cf8f1be12 diff --git a/qtwebchannel b/qtwebchannel index 97d2deb5..5821cad4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 97d2deb55b854fd2b97efc0a5b41da28444c6e78 +Subproject commit 5821cad4caac94d94994998602a9c0594c91f69f diff --git a/qtwebsockets b/qtwebsockets index 78607d65..0b418f55 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 78607d656e18717e2edb5e0430e7eeefaf24fa8b +Subproject commit 0b418f5512943eca6059855a584902f70a5dbadb diff --git a/qtwebview b/qtwebview index f016c778..c47248d9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f016c7781fb418fd57bae62d22ce46f8711de62a +Subproject commit c47248d9a297d0b121c723377b6d44dc9f876603 diff --git a/qtwinextras b/qtwinextras index d4985a34..f688deb0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d4985a348ccb2e3b83d64dbc95f5f2bab83e9bc6 +Subproject commit f688deb091537884517a0fb4bda7bd6cb8dcdada diff --git a/qtx11extras b/qtx11extras index 922a92b5..def0ad51 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 922a92b533edc9bbefee729a8d91b28fbe0e3945 +Subproject commit def0ad5122a4549b903736fa7a8cc68d936ad3f3 diff --git a/qtxmlpatterns b/qtxmlpatterns index 07fdc1b9..4d95d643 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 07fdc1b94d816b1c785af69a36fd8f756b7964af +Subproject commit 4d95d64382eefcb50bea5d900989cb24d56bf656 From 2e329bc68eb5af977dca1982ed608dc058fdf7f9 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:22:32 +0200 Subject: [PATCH 03/25] Provisioning: openSUSE - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index 4ebc1b44..d76364a8 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -7,6 +7,9 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts From f322d6047ac97f7c73760afef1a25ed1cb8968ab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 2 Feb 2018 15:00:05 +0200 Subject: [PATCH 04/25] Update submodules on '5.10.1' in qt5 Change-Id: Ide442890f290ee8ed14950c90f9a0f6852eebc62 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 1360f39a..30abe028 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1360f39aa811df96c2762cf081702f7a86a782cd +Subproject commit 30abe028f9a95fa32fbb77cb60063d062e13f7ff diff --git a/qtbase b/qtbase index 69d2501e..15ae7949 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 69d2501ee1900c43a35802eae05a734e479a7776 +Subproject commit 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a diff --git a/qtconnectivity b/qtconnectivity index 39a7ba2d..78782157 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 39a7ba2d666c52c3dd732483619cadf6b7a49d60 +Subproject commit 787821571b4a7cce8eb9faccb0fed10ee944d8a5 diff --git a/qtdeclarative b/qtdeclarative index 598a5dd8..2e65f6c2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 598a5dd899e7c3cc77441baeff2630608ffde89a +Subproject commit 2e65f6c2a5d84f4369245cabdc03eca4c19851f0 diff --git a/qtdoc b/qtdoc index ea25c59a..d10d9f5f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea25c59aa9e6d7ef69ba6e06a1509042b4af0d51 +Subproject commit d10d9f5fae5ff76c1d600b70e6482cd23f83220b diff --git a/qtmultimedia b/qtmultimedia index 0a71cf73..4395fed2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0a71cf73f1d5cad5b45972a51c4680b55671470e +Subproject commit 4395fed2b35dd12bb9bde5e20d91908d28196a06 diff --git a/qtquickcontrols b/qtquickcontrols index 698a8268..48bfc02e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 698a8268f786d74726eb07255df2d26ac2269079 +Subproject commit 48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ac6f4903..efc5564c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ac6f4903aeb2e8399b5aa538b35a760f0392568c +Subproject commit efc5564c19f3b15eb9a7b0022d201c866a9cf216 diff --git a/qtremoteobjects b/qtremoteobjects index c26dd694..61d2de26 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c26dd694e8374b478bf428bc9e8753cfc0c3a523 +Subproject commit 61d2de26db7b90ad0ed3923b5deecd1c5b3be46a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1a9158bf..39567625 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb +Subproject commit 39567625f6168fab057eb76ad048dc41e62b7bf4 diff --git a/qtwebengine b/qtwebengine index c309e309..47a5d4d1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c309e309ef2a7ec0fd56e1dd9ced4bcabacb5976 +Subproject commit 47a5d4d100f9ac84ef089db5de102ab4001ed80e diff --git a/qtxmlpatterns b/qtxmlpatterns index 3585d226..6b198fef 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3585d2269ba2d9777e3afccef026d1e159f47f5d +Subproject commit 6b198fef037dc8bc10d209342123f1aa38e807b3 From 9a160d28d57605db98353740523d086ea5c5446d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Feb 2018 03:02:48 +0200 Subject: [PATCH 05/25] Update submodules on '5.10' in qt5 Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 46319648..04afcf1c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 46319648436814afb5a77755dde6681e304befaf +Subproject commit 04afcf1cb9e79697360baa01a97a26815237eba1 diff --git a/qtbase b/qtbase index 15ae7949..28cf5ae0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a +Subproject commit 28cf5ae000de36cd6ad0df942c2f99bfa7e22129 diff --git a/qtcharts b/qtcharts index 47f3f659..b830bb00 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 47f3f659d2c4bae874f78998aece8145605bfd50 +Subproject commit b830bb006a7d8c27cc019b6737c669e96098bc3f diff --git a/qtdeclarative b/qtdeclarative index 2e65f6c2..6fe4c1f2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2e65f6c2a5d84f4369245cabdc03eca4c19851f0 +Subproject commit 6fe4c1f2803abac74da152b9a5656eff2d71dceb diff --git a/qtlocation b/qtlocation index 518633da..b9d4da55 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 518633da419d6cfaf603773b9e8c5840e783bc4a +Subproject commit b9d4da55cf0b775467df43c1d868dc4d58b96b45 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index efc5564c..a5aa09df 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit efc5564c19f3b15eb9a7b0022d201c866a9cf216 +Subproject commit a5aa09dfd7e42f38545fe4640b0fa251bdd32be9 diff --git a/qttools b/qttools index 3c7675d9..fb16802e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3c7675d9609a15bea81884560920bded736f79a6 +Subproject commit fb16802edcbf8feeecd6a4f760888852aafd117e diff --git a/qtwayland b/qtwayland index 06230d22..b67d7906 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 06230d22488796d92ea130e985d1e0ee2ed05199 +Subproject commit b67d79067515c3f34a8b84fee9fef8484fbdad76 diff --git a/qtwebengine b/qtwebengine index 7644564d..75c40c17 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7644564d754bbee640a091950b77e23586c2d283 +Subproject commit 75c40c1799db3ba3919d5288c4f861585dc4a630 From 532f1dea57210970cb8449fbb94f46e356706163 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 6 Feb 2018 10:03:01 +0100 Subject: [PATCH 06/25] Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU Decorations were previously disabled within the Wayland tests to work around another issue. That issue has now been fixed, and decorations have been enabled again, but these tests now became flaky when run within QEMU. Task-number: QTBUG-66173 Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de Reviewed-by: Sami Nurmenniemi Reviewed-by: Jani Heikkinen --- .../qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 9ff1ec6c..b2057b21 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -94,4 +94,10 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" +qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" +qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" From 9fa8b3ca357a63e5bbb296beadee3c83357fa1cf Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 2 Feb 2018 11:19:35 +0200 Subject: [PATCH 07/25] Provisioning: openSUSE - Disable file indexing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Baloo file indexing sometimes takes up a great amount of CPU capacity and should therefore be disabled. Task-number: QTQAINFRA-1702 Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index d76364a8..d5439f0e 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -15,6 +15,8 @@ echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc +echo "Disabling file indexing." +sudo balooctl disable if [ "$proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy From 38649924dfc0a6da0a6a5573b95511191ae44310 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:11:58 +0200 Subject: [PATCH 08/25] Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 6c198b1d..76277f02 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -47,6 +47,7 @@ ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 ExceptionProxy=104 +ExceptionGrub=105 try ( @@ -58,6 +59,9 @@ try gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2 echo "Disable questions on shutdown." gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3 + echo "Set grub timeout to 0" + sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub + sudo update-grub || throw $ExceptionGrub echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS @@ -84,6 +88,10 @@ catch || { echo "Failed to disable questions on shutdown." exit 1; ;; + $ExceptionGrub) + echo "Failed to set grub timeout." + exit 1; + ;; $ExceptionNTS) echo "Failed to set network teset server address into /etc/hosts." exit 1; From 052aa06ef41a790513b0fb08a39b8df023c7f5a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Feb 2018 09:19:55 +0100 Subject: [PATCH 09/25] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index b7e43673..1cc15c4b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b7e436738756b1d5d7a45201b7a7204d7fe128a1 +Subproject commit 1cc15c4b6d65a22ab4018226a96baf843feb1f00 diff --git a/qtconnectivity b/qtconnectivity index 234907ae..a7be018d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 234907ae5fc3dd5b9e5c3b0fa76d65f986104a27 +Subproject commit a7be018dfae73e4e2a68fd82e775d05d52aea983 diff --git a/qtdeclarative b/qtdeclarative index 6958308c..f70c0cee 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6958308c09ceda855a30c5a2d491f078c5104071 +Subproject commit f70c0ceee44b6e36696e33a9c4df278e1c40daa6 diff --git a/qtmultimedia b/qtmultimedia index fb477cdb..c98c346d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fb477cdb126848e416845df348ca4031ccc2f87b +Subproject commit c98c346d12b1a6ba99d18059db5b941d6138b081 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 223c1524..7eb5f8a5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 223c1524a7693e2c0f2312dd738c6aeb484358a5 +Subproject commit 7eb5f8a54bdcf0520a7aa0a2874a059060866097 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 88be503a..1838b75f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 88be503aa376a906fa003c5e89d45c47c69d8ca4 +Subproject commit 1838b75f6c21d71e7bd88b03e44c07287879a4e8 diff --git a/qtwebengine b/qtwebengine index adb86777..e864d865 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit adb8677717472e020e35084839ab3726920ec386 +Subproject commit e864d8656c2682fc79a5affe789992de318c8f8a From b4b62658ac231dbcc17360dcc946117d1be39ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 30 Jan 2018 23:52:33 +0200 Subject: [PATCH 10/25] Fix environment variable checking for proxy Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 76db19d4..a7b83fd7 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -88,7 +88,7 @@ try fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo $proxy | cut -d':' -f3) echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index 90b32d0d..fc07e6fa 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -37,6 +37,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index a7718d96..bf97a166 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 76277f02..e00e2498 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -66,7 +66,7 @@ try echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy fi ) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index d5439f0e..c0e7b8e9 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -18,7 +18,7 @@ echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Disabling file indexing." sudo balooctl disable -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi From c3096caa14393690df2d6bdb79b144924c56f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 1 Feb 2018 08:32:35 +0200 Subject: [PATCH 11/25] Remove excess comment line for shellcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/cmake_linux.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 98af57c8..7154d822 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -37,7 +37,6 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" From 9d73a2b3047e1e463c9c031583819740a8fce600 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Feb 2018 09:39:15 +0100 Subject: [PATCH 12/25] Update submodules on '5.10.1' in qt5 Change-Id: I88fa5fe223a0e32a3c0261342d490f00561c6497 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 50578d38..cbbd33d2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 50578d3893c611b3a33bbd8239a126f2b8f234b1 +Subproject commit cbbd33d213167d1f6dc54ad876b195fd635f0c2b diff --git a/qtandroidextras b/qtandroidextras index 5794f313..77c94d07 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 5794f3130cb1894ea3d8143c2c89de23886d9c17 +Subproject commit 77c94d077b41439217c23c01a1a3015fcd6497d6 diff --git a/qtbase b/qtbase index 15ae7949..ea667537 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a +Subproject commit ea6675374fa6e94bd4cf10613c85cee2c724bcdc diff --git a/qtcanvas3d b/qtcanvas3d index b742b8f1..0eecd96a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit b742b8f1b654bd185244973f7bae60da951d41a4 +Subproject commit 0eecd96a7b83e8b1fc2811ec366b4ca1980296e0 diff --git a/qtcharts b/qtcharts index 47f3f659..9a4f99f5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 47f3f659d2c4bae874f78998aece8145605bfd50 +Subproject commit 9a4f99f518a49716cc9cc300eb456c6b13f9e8d1 diff --git a/qtconnectivity b/qtconnectivity index 78782157..2331b915 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 787821571b4a7cce8eb9faccb0fed10ee944d8a5 +Subproject commit 2331b915d207fe794a07b834ec2bf8578965bc4d diff --git a/qtdatavis3d b/qtdatavis3d index 4ceabb63..397e5014 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4ceabb63a6db137809a08cab11d10b0b0df5d411 +Subproject commit 397e50147407c16a16b6505558992ca3180f9aff diff --git a/qtdeclarative b/qtdeclarative index 2e65f6c2..3e910628 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2e65f6c2a5d84f4369245cabdc03eca4c19851f0 +Subproject commit 3e91062877c0853aff693799bc5e33cdf7aaad42 diff --git a/qtdoc b/qtdoc index d10d9f5f..bede6625 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d10d9f5fae5ff76c1d600b70e6482cd23f83220b +Subproject commit bede662542a0dbf1dfc8737cb11a69447851efed diff --git a/qtgamepad b/qtgamepad index 544d3e4f..e6f36661 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 544d3e4f6f42771b38cafd8a200b16299f2d102c +Subproject commit e6f366618dc9a3d232446197d6fea7c814e53828 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 66031e93..a38c4da7 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 66031e932c321ccb936e254b5d1810fa633c6cb0 +Subproject commit a38c4da7b598f5a185d7c9f824482d418353e6bf diff --git a/qtimageformats b/qtimageformats index 54cdb5b0..0b9b3d57 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba03 +Subproject commit 0b9b3d578ad2e2620bf8b851fe346314d8492fd3 diff --git a/qtlocation b/qtlocation index 518633da..e60c89f6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 518633da419d6cfaf603773b9e8c5840e783bc4a +Subproject commit e60c89f605ecd33a3bae8f1f91fed7934eb2d50d diff --git a/qtmacextras b/qtmacextras index c190b14a..551cd415 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit c190b14ae3ce5ffd2701b457ec8da1b32820be71 +Subproject commit 551cd4159b6b7e72f701bad2e8bbb6e5ceccc102 diff --git a/qtmultimedia b/qtmultimedia index 4395fed2..038716bb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4395fed2b35dd12bb9bde5e20d91908d28196a06 +Subproject commit 038716bb1f2d9b95f2d638e2d61d297563343af9 diff --git a/qtpurchasing b/qtpurchasing index 49c5461a..d9252455 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 49c5461af0888950b80eb9558647ccd764d55737 +Subproject commit d925245573a76b23b231a93fa4674fb340f226a7 diff --git a/qtquickcontrols b/qtquickcontrols index 48bfc02e..09ebb25a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2 +Subproject commit 09ebb25aa686fc3f47f860905c2abb32a95c75d1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index efc5564c..e693ad2c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit efc5564c19f3b15eb9a7b0022d201c866a9cf216 +Subproject commit e693ad2c4ae22f8813befd5fe825c855537497ed diff --git a/qtscript b/qtscript index 84b13fd9..76bcf9b5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 84b13fd9fcd85d39411150f8ae46916a048c413c +Subproject commit 76bcf9b526f96edb35469e9de4b032a112a2b1c0 diff --git a/qtscxml b/qtscxml index be2cb77f..d9b2f8c5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit be2cb77f0c882444d4d1080953b4d1b961973c0a +Subproject commit d9b2f8c56d162c108d5427769a8e496dd7a3b62e diff --git a/qtsensors b/qtsensors index 5b5a7b4d..d5a94c55 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5b5a7b4d1f49960d2b7b80735bd4eb6340b1acf0 +Subproject commit d5a94c5595170fed9a0f7d3d42ef4b0216909d0d diff --git a/qtserialbus b/qtserialbus index b65de45f..d5d35d64 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b65de45fbfa08d0d2d5b89df77181d3726598097 +Subproject commit d5d35d64d06729322c80327de40badaf553df87e diff --git a/qtserialport b/qtserialport index 7c827dcb..fa688ac5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7c827dcbf82d5e5bfbba4053a32c54413a95182a +Subproject commit fa688ac5c36a16aa3b44d4ca1509f9386e670a89 diff --git a/qtsvg b/qtsvg index 520ebdba..af351370 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 520ebdbacb3b0d823126d82306107808287425a3 +Subproject commit af35137016f082c3fa15e61414f3c78c73ac322f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 39567625..85d35bb1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 39567625f6168fab057eb76ad048dc41e62b7bf4 +Subproject commit 85d35bb12235dd6b92c898ddb6d6e84703d25d48 diff --git a/qtwayland b/qtwayland index 06230d22..db36bc0d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 06230d22488796d92ea130e985d1e0ee2ed05199 +Subproject commit db36bc0d9ccae21e84cd54be3e18ae539542eadc diff --git a/qtwebchannel b/qtwebchannel index a2b88f9b..7540a85c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a2b88f9ba0ce2e03ffa73ba26e910e988db5d6c1 +Subproject commit 7540a85c82cd940b7da3ea75eccad7e733bd0ae6 diff --git a/qtwebengine b/qtwebengine index 47a5d4d1..45189de8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 47a5d4d100f9ac84ef089db5de102ab4001ed80e +Subproject commit 45189de8f0e8364cbcd600f3c4460018544beda6 diff --git a/qtwebsockets b/qtwebsockets index f8665a7c..2160c268 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7 +Subproject commit 2160c268ec80012f86be3eef20e05c267cdd2926 diff --git a/qtwebview b/qtwebview index eef3467c..7445cd28 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit eef3467cfad9f6ad892344bfcadbd59b5bcb4f53 +Subproject commit 7445cd28616e68af3cf5e074a5576cbe6c5bf491 diff --git a/qtwinextras b/qtwinextras index a346f1d1..857708b9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a346f1d1cdc997948d1fc84ca65031463f1b86a4 +Subproject commit 857708b93c42b6b8cb18bb397a51a10199607636 diff --git a/qtx11extras b/qtx11extras index fcd1d9a0..a751298b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit fcd1d9a09d22619dfae4c1d4f9911e9acce2e893 +Subproject commit a751298bc381b0fd0c6867e43d2613b98c2cb71f diff --git a/qtxmlpatterns b/qtxmlpatterns index 6b198fef..7c4113d6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6b198fef037dc8bc10d209342123f1aa38e807b3 +Subproject commit 7c4113d6e6215b26b866ed2a0da0fa5e0c12b8ea From af55ddc91349d408775bef8d29db7dabae7aef72 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 6 Feb 2018 14:58:42 +0200 Subject: [PATCH 13/25] Provisioning: MacOS-10.12 - Disable sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256 Reviewed-by: Tony Sarajärvi --- .../qtci-macos-10.12-x86_64/05-systemsetup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 20430d6a..6420efe7 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -49,6 +49,7 @@ ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 ExceptionDisableScreensaverPassword=105 +ExceptionDisableSleep=106 try ( @@ -56,6 +57,9 @@ try # For current session defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver + echo "Disable sleep" + sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep + # For session after a reboot mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver ( @@ -126,5 +130,10 @@ catch || { echo "Failed to disable requiring of password after screensaver is enabled." exit 1; ;; + $ExceptionDisableSleep) + echo "Failed to disable sleep." + exit 1; + ;; + esac } From cadedac3b4ae9ea0b7a500accf0d1e3eeae47bd9 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 6 Feb 2018 15:39:57 +0200 Subject: [PATCH 14/25] Provisioning: osx-10.11 - Disable sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618 Reviewed-by: Tony Sarajärvi --- .../provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 5cb067a7..994dedf4 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -49,6 +49,7 @@ ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 ExceptionDisableScreensaverPassword=105 +ExceptionDisableSleep=106 try ( @@ -56,6 +57,9 @@ try # For current session defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver + echo "Disable sleep" + sudo pmset sleep 0 displaysleep 0 || throw $ExceptionDisableSleep + # For session after a reboot mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver ( @@ -126,6 +130,11 @@ catch || { echo "Failed to disable requiring of password after screensaver is enabled." exit 1; ;; + $ExceptionDisableSleep) + echo "Failed to disable sleep." + exit 1; + ;; + esac } From f2dbac41cf12de7fde39eaad4226b409cedbbe92 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Feb 2018 12:56:32 +0200 Subject: [PATCH 15/25] Update submodules on '5.10.1' in qt5 Change-Id: Icac819f46b0faa05367d73e2435f98975bda2811 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 30abe028..31f424bb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 30abe028f9a95fa32fbb77cb60063d062e13f7ff +Subproject commit 31f424bb81cd2583920d3d521e1e01f01c2d28e2 diff --git a/qtbase b/qtbase index ea667537..6c6ace9d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ea6675374fa6e94bd4cf10613c85cee2c724bcdc +Subproject commit 6c6ace9d23f90845fd424e474d38fe30f070775e diff --git a/qtimageformats b/qtimageformats index 0b9b3d57..892d4a0d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0b9b3d578ad2e2620bf8b851fe346314d8492fd3 +Subproject commit 892d4a0df7dccc6e70586835bb1211cf1b79bc69 diff --git a/qtlocation b/qtlocation index e60c89f6..ec00ff89 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e60c89f605ecd33a3bae8f1f91fed7934eb2d50d +Subproject commit ec00ff89bee900a1b8925e227a892bc57839cd60 diff --git a/qttools b/qttools index 3c7675d9..03ebf1c3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3c7675d9609a15bea81884560920bded736f79a6 +Subproject commit 03ebf1c3d6ceae715c696a171920a0204c58dd0a diff --git a/qtwebengine b/qtwebengine index 45189de8..9dc8dff7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 45189de8f0e8364cbcd600f3c4460018544beda6 +Subproject commit 9dc8dff7a8f4d58f71d816375d49f8829f06aae5 From 066373c9c6e6d149aa10aed9f9184612d9e939ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Feb 2018 10:12:08 +0100 Subject: [PATCH 16/25] Update submodules on '5.9' in qt5 Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index ceae7436..2a29dec5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ceae743678d41a58154612781e896c04c87a8c4f +Subproject commit 2a29dec5f56b921c1ff7090f837ec24b3f9dd5a5 diff --git a/qtbase b/qtbase index 1cc15c4b..72918d19 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1cc15c4b6d65a22ab4018226a96baf843feb1f00 +Subproject commit 72918d196c3617fb1cb9aee2c5f1a88e3bc30041 diff --git a/qtdeclarative b/qtdeclarative index f70c0cee..d4ff2907 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f70c0ceee44b6e36696e33a9c4df278e1c40daa6 +Subproject commit d4ff2907162e20e2288357c428b0df88f7396f92 diff --git a/qtimageformats b/qtimageformats index 00e422c3..25d7e044 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 00e422c39b3c190acbf5609247a4172b45281d15 +Subproject commit 25d7e0440f091b39c2865187eb0630045fa20e46 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7eb5f8a5..44d02e3f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7eb5f8a54bdcf0520a7aa0a2874a059060866097 +Subproject commit 44d02e3f0cf4db7e6d426c75de459019c574500a diff --git a/qttools b/qttools index 21f39607..99235a62 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 21f3960738bf73e4663bde5108d8859367efb66f +Subproject commit 99235a6262fd773ec845b8aea8f770dc62b50db5 diff --git a/qtwebengine b/qtwebengine index e864d865..2e06a051 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e864d8656c2682fc79a5affe789992de318c8f8a +Subproject commit 2e06a051404c250b847421364c098bf541c43773 From 769a34ed26589702623fe41aeac72527c3e7c210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 7 Feb 2018 13:52:55 +0200 Subject: [PATCH 17/25] Provision: Use specific Python2 version in macOS Make sure we use some specific Python2 version on macOS instead of the one pre-installed along with system. Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/python2.sh | 52 +++++++++++++++++++ .../qtci-macos-10.12-x86_64/25-python2.sh | 4 ++ .../qtci-osx-10.10-x86_64/25-python2.sh | 4 ++ .../qtci-osx-10.11-x86_64/25-python2.sh | 4 ++ 4 files changed, 64 insertions(+) create mode 100755 coin/provisioning/common/macos/python2.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh new file mode 100755 index 00000000..fbebee42 --- /dev/null +++ b/coin/provisioning/common/macos/python2.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs python2 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" +SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv + +SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" + +echo "python2 = 2.7.14" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh new file mode 100755 index 00000000..ef65edad --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" From 404805141a615777a51906c57c9850a7bda3f729 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 9 Feb 2018 15:33:25 +0200 Subject: [PATCH 18/25] Disable set -e when enabling devtoolset-4 environment variables Change-Id: If427179da490f14963077cd733082258e354710f Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index b685362e..9b0cd0f6 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -32,6 +32,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# +set +e source /opt/rh/devtoolset-4/enable From 443328fa9f47dbd1150e0d498bdb4234a3a917db Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Feb 2018 03:01:26 +0200 Subject: [PATCH 19/25] Update submodules on '5.11' in qt5 Change-Id: Ie33f91194895634fbf837210e534b78e7559989e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index c8a48a9a..a400bbe5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c8a48a9a28889598cb2a06fc8d5deb9b803509ca +Subproject commit a400bbe50deb98f5d924cd4f6562e1b868e73248 diff --git a/qtactiveqt b/qtactiveqt index 6ddc5720..d35a3142 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6ddc5720d0bc03f72bd47718a37294ca7c211d86 +Subproject commit d35a31422ecd7f8428d8d3fd925d6e45a7af91a5 diff --git a/qtandroidextras b/qtandroidextras index bb3c2b90..1b47102b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit bb3c2b9090bd1e1c9664492413c05fedbde575fa +Subproject commit 1b47102b58f4ddcdd24e3a261a5dd258df607b58 diff --git a/qtbase b/qtbase index 2cb1db64..8920bf32 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2cb1db64370989fffeec313c196fe573c479e6aa +Subproject commit 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b diff --git a/qtcanvas3d b/qtcanvas3d index b3d1613d..ab089732 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit b3d1613d1c2eb2f942336c27b4e760e45f18c7c5 +Subproject commit ab0897320e59e5a4ddd2d667d02f3e54130b5c7d diff --git a/qtcharts b/qtcharts index c844c1e5..4aff96b9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c844c1e5bde966c50a41d43c942b806d5c2f251e +Subproject commit 4aff96b9bb614128043f448eaca3ff7808fd5ad1 diff --git a/qtconnectivity b/qtconnectivity index 1d9d30a7..b295f466 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1d9d30a75a1c13851a9f050d7ce4f8057c4fa9fb +Subproject commit b295f466b8a9cfc756ed22794e3b35ab20e20dbb diff --git a/qtdatavis3d b/qtdatavis3d index 8b0018cb..c4d27bc9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8b0018cb1a4dea8e74de01427d79494a68d843c6 +Subproject commit c4d27bc94a062779a17001ad69113d1bccdcbd57 diff --git a/qtdeclarative b/qtdeclarative index f252b522..8190fd16 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f252b5229dc291cbf0773d2252068b0b2a6d7c9e +Subproject commit 8190fd16f8d77b22424e3a46d9aac453ecb0fe34 diff --git a/qtdoc b/qtdoc index 1aa64c49..4044157a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1aa64c4997d92f053ca211dc0992213c14db563d +Subproject commit 4044157abe77899511561fd3adece04cb2ee4b18 diff --git a/qtgamepad b/qtgamepad index 0ed771f5..9152a285 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0ed771f5045729052cef906475395dc8ced3fc8a +Subproject commit 9152a285cdb072bc622e693f1a74f2ee3eda5503 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 586476ff..86582664 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 586476ff2ce59ba4ea2cee2ab59818e0bda4b90c +Subproject commit 8658266498ecc98f7d73486746ad8a27368c7974 diff --git a/qtimageformats b/qtimageformats index a10fec1d..a0dfb529 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a10fec1d386efd99f95973c7d446f94622a5da56 +Subproject commit a0dfb529325e0def520dd11853d76a85d78a393b diff --git a/qtlocation b/qtlocation index 8d1b370c..7b2a718e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8d1b370cf371e73540424191241a7432b41d0785 +Subproject commit 7b2a718eba8eb91e6135605ef6f513b4365b5a58 diff --git a/qtmacextras b/qtmacextras index d05fbba6..d67906ff 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit d05fbba64263917e997d49d152747de2574c804c +Subproject commit d67906ff086766da7326844627ae5b02e4099ed6 diff --git a/qtmultimedia b/qtmultimedia index 923c2ab6..51914a22 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 923c2ab674d903d5c71254bf127d2784d3cc6980 +Subproject commit 51914a22de1232913f8e4be4468d676b300aed7c diff --git a/qtnetworkauth b/qtnetworkauth index 1a251f8f..17d65453 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1a251f8fcf2749604dc15a4d7d2ceb636daac61c +Subproject commit 17d654536d544f33bf1e588d3702cdc95de7841e diff --git a/qtpurchasing b/qtpurchasing index a78241bf..977435ba 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit a78241bf0df8eef6dec1d935892697e01ae5e659 +Subproject commit 977435ba3b7601d3c76216ee29545d37b9e6a0a3 diff --git a/qtquickcontrols b/qtquickcontrols index 4459886e..25d6bd04 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4459886e3f949821425dd5fd9fc9da0416d0ffc9 +Subproject commit 25d6bd04611837cbc81f6a1247c3008f08ed9f9d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 72abc4e9..d95e67c2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 72abc4e94764b4a5592a9d153ff9991fe66d7395 +Subproject commit d95e67c291d213cdbf41b23c535b47aa3a553ab5 diff --git a/qtremoteobjects b/qtremoteobjects index a0b0c1f6..7f7f1b46 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a0b0c1f6a3927e2f31b40619c17bffaf7571dd24 +Subproject commit 7f7f1b46dc0e517d61b66d01640ffba363495192 diff --git a/qtrepotools b/qtrepotools index d55c328b..c112252b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d55c328b5bd5c02e5c9fe202d41fb30360f9f44a +Subproject commit c112252bc2e0e35dbdc946171673fbc867a52996 diff --git a/qtscript b/qtscript index a002116e..047d82ac 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a002116ece257e2a2a1e6047c43652073806917e +Subproject commit 047d82ac1e84c0e046f643b2267c3c4453148896 diff --git a/qtsensors b/qtsensors index 0a6b3035..d87fdee3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0a6b30351a0e80447c2dd683765fc1fe66c1eda2 +Subproject commit d87fdee381318de4d8db10dd0a502dc9c0965623 diff --git a/qtserialbus b/qtserialbus index 1399a779..eb5f9325 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1399a77954ec4b40fa14b75218e046e76d1324bc +Subproject commit eb5f932539d4146c263eac3c2345f4a9ac6d63e4 diff --git a/qtserialport b/qtserialport index 3f8222ef..1b425f4d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3f8222efa943617994d982bf31fcda5e568952c4 +Subproject commit 1b425f4d5a91d9c354b9fa47a9cd61360110e3c7 diff --git a/qtspeech b/qtspeech index 0b3b3431..859ef7d5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0b3b3431429efd7f7aca751afeeb862c1ff4f9fb +Subproject commit 859ef7d5e75e8ad85276f0b7760a9012db42201d diff --git a/qtsvg b/qtsvg index 4366fe95..1333cc27 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4366fe95477f96489f9a7a99df96230f0ac72112 +Subproject commit 1333cc272ff33d864400af970729ffb95cdb8eac diff --git a/qttools b/qttools index 5b35868d..ef5dc9d4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5b35868d810751698070f50d894ec1f0cc969a38 +Subproject commit ef5dc9d466438c22a2b0a66f25e18e2c9e55d37c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 93af389b..054f4178 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 93af389b0cb786864af8e54d53c7da308cb557a8 +Subproject commit 054f4178095172117e9de00c4c3ecbff45796b0a diff --git a/qtwayland b/qtwayland index ebe5f609..6e4772bf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ebe5f6097af0fd01b3733ebd4d920f710e4b186a +Subproject commit 6e4772bfb6a2818f05fe1bb8132f96d3f868e3d0 diff --git a/qtwebchannel b/qtwebchannel index f1a65fe2..859135f6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f1a65fe2e8294f9a42f360cf13539735211e5878 +Subproject commit 859135f6fa0c4a5f907991168f4076751912c764 diff --git a/qtwebengine b/qtwebengine index 7a3e38d7..7decc1a4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7a3e38d779352ca09e9118d735c9a2b0ea55b763 +Subproject commit 7decc1a4716fbc8315318e3e8635f7aec0be58d6 diff --git a/qtwebglplugin b/qtwebglplugin index 76e27b8f..3ede2fe3 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 76e27b8f62afba31a2c675eba4445308eaf47df2 +Subproject commit 3ede2fe3a426675691c32e6ee07913fc3c27d0fd diff --git a/qtwebsockets b/qtwebsockets index b0fe74a5..4b517f81 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b0fe74a5b924646568291b5ce65e7d13bccbc731 +Subproject commit 4b517f81d5db4f452eee5330f8f9db9877909130 diff --git a/qtwebview b/qtwebview index 0f0d87a7..cd2212f8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0f0d87a757fe30976c183207968e1c07f87460d5 +Subproject commit cd2212f828a0e91c2ee7e04f0b7b32aa05880f80 diff --git a/qtwinextras b/qtwinextras index c2363553..7d5fc229 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit c23635538f51eaa5e0b9beedb391b014f7e2d4c4 +Subproject commit 7d5fc2299fe6b91ab107428f87dd88386041837a diff --git a/qtx11extras b/qtx11extras index 7eae66f6..8c57d622 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 7eae66f6693e560b01c03907bfeccb1deac7aed5 +Subproject commit 8c57d6220db57866a1c7cc35ac6f902225c28095 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5fac6d6f..51ab06a8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5fac6d6fda04924b03f6a5651933f0c055d0df23 +Subproject commit 51ab06a84a03a3d11e175f1d681ee620c41b4c20 From 5186a96b47d97f03425ab44475eadfc803b3d127 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Feb 2018 22:04:42 +0100 Subject: [PATCH 20/25] Update submodules on '5.11' in qt5 Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index a400bbe5..907d0119 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a400bbe50deb98f5d924cd4f6562e1b868e73248 +Subproject commit 907d01190813f8a2c93f2561fa33791398840b51 diff --git a/qtbase b/qtbase index 8920bf32..ede6c447 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b +Subproject commit ede6c447560b9419ee9d2991059e488a7d5a3208 diff --git a/qtcharts b/qtcharts index 4aff96b9..b78d45e7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4aff96b9bb614128043f448eaca3ff7808fd5ad1 +Subproject commit b78d45e7bcb10a0faf01aff4f8c632957d63e9d7 diff --git a/qtdeclarative b/qtdeclarative index 8190fd16..238cc098 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8190fd16f8d77b22424e3a46d9aac453ecb0fe34 +Subproject commit 238cc098d785b4fe76fbc8422b340d98ff8c1a1b diff --git a/qtlocation b/qtlocation index 7b2a718e..3d2993d0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7b2a718eba8eb91e6135605ef6f513b4365b5a58 +Subproject commit 3d2993d0c31540f48244918541741c5d521a4dc4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 054f4178..5f80f66d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 054f4178095172117e9de00c4c3ecbff45796b0a +Subproject commit 5f80f66d3b5878bba021d4ac67e35388bfe84fdb diff --git a/qtwebengine b/qtwebengine index 7decc1a4..ba8d31f5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7decc1a4716fbc8315318e3e8635f7aec0be58d6 +Subproject commit ba8d31f5513b486add0ffc84836a4062bedf234a diff --git a/qtwebglplugin b/qtwebglplugin index 3ede2fe3..961198b4 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 3ede2fe3a426675691c32e6ee07913fc3c27d0fd +Subproject commit 961198b42104ea644580b14e763ec87bda0e966c From e086fbc6cb80b089ed3e336a47e849fc1b5023ca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Feb 2018 14:17:58 +0100 Subject: [PATCH 21/25] Update submodules on '5.9' in qt5 Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttranslations | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 2a29dec5..c40c7ac6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2a29dec5f56b921c1ff7090f837ec24b3f9dd5a5 +Subproject commit c40c7ac6b57603ecb992f666ce7435110bb3e587 diff --git a/qtbase b/qtbase index 72918d19..58541d1c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 72918d196c3617fb1cb9aee2c5f1a88e3bc30041 +Subproject commit 58541d1c68fcf121318fe153e1469b9d0ebfec63 diff --git a/qtdeclarative b/qtdeclarative index d4ff2907..8fdf4667 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d4ff2907162e20e2288357c428b0df88f7396f92 +Subproject commit 8fdf466741f31bc9f33db7b5d09c2e282f0b6bbe diff --git a/qtdoc b/qtdoc index 81d8e665..de869e95 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81d8e665204ed6b9facabf5d170dd91acc06c36c +Subproject commit de869e95fa9dce9b0f12e7c383c65a72e01a0616 diff --git a/qtlocation b/qtlocation index 66ba05c8..cc3a5a92 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 66ba05c88524023012efdb76d54d48f47411a5a4 +Subproject commit cc3a5a926db8d07c8282407a7b010b4ab2289592 diff --git a/qtmultimedia b/qtmultimedia index c98c346d..2cc31ddd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c98c346d12b1a6ba99d18059db5b941d6138b081 +Subproject commit 2cc31ddded7b83dc47ddd6dde0c234e51caa9d88 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 44d02e3f..83da5b25 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 44d02e3f0cf4db7e6d426c75de459019c574500a +Subproject commit 83da5b251d06c60a724d10688bd8fcdb15ec4e63 diff --git a/qtrepotools b/qtrepotools index d55c328b..c112252b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d55c328b5bd5c02e5c9fe202d41fb30360f9f44a +Subproject commit c112252bc2e0e35dbdc946171673fbc867a52996 diff --git a/qttranslations b/qttranslations index 97a0f2e1..6ccd6576 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 97a0f2e132983018473886eb1e3f5ac761839c6e +Subproject commit 6ccd65767806d0b03763e0a0ae5efc341fd32486 From 060d0bdec16a75b94ca5022c99096fb1f59c71f3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 18 Feb 2018 16:57:23 +0100 Subject: [PATCH 22/25] Update submodules on '5.11' in qt5 Change-Id: I92f9401dc98ab115fe737ec5395025055830140f Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 907d0119..51dca651 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 907d01190813f8a2c93f2561fa33791398840b51 +Subproject commit 51dca6514593978beb28afa1c9f99ccd9a5c212c diff --git a/qtbase b/qtbase index ede6c447..8a66924c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ede6c447560b9419ee9d2991059e488a7d5a3208 +Subproject commit 8a66924ca000fe4e05b680ca82c6587da8d28e0b diff --git a/qtdeclarative b/qtdeclarative index 238cc098..ba05397a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 238cc098d785b4fe76fbc8422b340d98ff8c1a1b +Subproject commit ba05397ad723fa19125eb5ca2f91c7f437b21484 diff --git a/qtdoc b/qtdoc index 4044157a..aecf79e8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4044157abe77899511561fd3adece04cb2ee4b18 +Subproject commit aecf79e838ed039e749b6e76503bf8f49d59258d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d95e67c2..937f82c8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d95e67c291d213cdbf41b23c535b47aa3a553ab5 +Subproject commit 937f82c8fe6efa9b22449a5d51f1006da1513c10 diff --git a/qttools b/qttools index ef5dc9d4..359dad81 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ef5dc9d466438c22a2b0a66f25e18e2c9e55d37c +Subproject commit 359dad818d450c015753a822a12ebd1ecbabad34 diff --git a/qtwebengine b/qtwebengine index ba8d31f5..51658fac 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ba8d31f5513b486add0ffc84836a4062bedf234a +Subproject commit 51658fac63299f818afd8ddde6dccee66a36efda From bcaeff8210adf235b76448e904e035504c1027ae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Feb 2018 03:01:40 +0200 Subject: [PATCH 23/25] Update submodules on '5.11' in qt5 Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index d35a3142..c2fed236 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d35a31422ecd7f8428d8d3fd925d6e45a7af91a5 +Subproject commit c2fed2369b31a6775aa52473b86ca9e3e07ab707 diff --git a/qtandroidextras b/qtandroidextras index 1b47102b..a2157a9d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1b47102b58f4ddcdd24e3a261a5dd258df607b58 +Subproject commit a2157a9dd2ee4ed3e998654595544dadaf129fe8 diff --git a/qtcanvas3d b/qtcanvas3d index ab089732..80d7f92b 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ab0897320e59e5a4ddd2d667d02f3e54130b5c7d +Subproject commit 80d7f92b9628076b681e509ddf8eae43cac550d5 diff --git a/qtcharts b/qtcharts index b78d45e7..1f78a69f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b78d45e7bcb10a0faf01aff4f8c632957d63e9d7 +Subproject commit 1f78a69f4f6c33393a0b43a9151c698aa3d05bbb diff --git a/qtconnectivity b/qtconnectivity index b295f466..7bcc5dc2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b295f466b8a9cfc756ed22794e3b35ab20e20dbb +Subproject commit 7bcc5dc2c323b2ed120fb7bf695286f6a01c44d0 diff --git a/qtdatavis3d b/qtdatavis3d index c4d27bc9..be7e45ca 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c4d27bc94a062779a17001ad69113d1bccdcbd57 +Subproject commit be7e45ca259d70d5f2ef0d11460261146fc1df95 diff --git a/qtdoc b/qtdoc index aecf79e8..83a5f5be 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aecf79e838ed039e749b6e76503bf8f49d59258d +Subproject commit 83a5f5be0e4464ec9b7698c03fffe9b6d379199c diff --git a/qtgamepad b/qtgamepad index 9152a285..313f2213 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 9152a285cdb072bc622e693f1a74f2ee3eda5503 +Subproject commit 313f221381507eee36c8e3bd0069b3e7962da140 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 86582664..3e28d47c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8658266498ecc98f7d73486746ad8a27368c7974 +Subproject commit 3e28d47cea038ca64c2e14ff449cc183c51643ce diff --git a/qtimageformats b/qtimageformats index a0dfb529..f878323a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a0dfb529325e0def520dd11853d76a85d78a393b +Subproject commit f878323a82fa69fcaeb37b42e10ba28759157f47 diff --git a/qtmacextras b/qtmacextras index d67906ff..5f9b1bca 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit d67906ff086766da7326844627ae5b02e4099ed6 +Subproject commit 5f9b1bca4af0bc7801d513a9424c70b47812cf12 diff --git a/qtmultimedia b/qtmultimedia index 51914a22..0354fdda 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 51914a22de1232913f8e4be4468d676b300aed7c +Subproject commit 0354fdda8b430f7749082ca55ad6c1dc781f3918 diff --git a/qtnetworkauth b/qtnetworkauth index 17d65453..e8552dda 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 17d654536d544f33bf1e588d3702cdc95de7841e +Subproject commit e8552ddaf17dad91df3a03ccfc0d708ab13d6d0e diff --git a/qtpurchasing b/qtpurchasing index 977435ba..51b83b74 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 977435ba3b7601d3c76216ee29545d37b9e6a0a3 +Subproject commit 51b83b74bb3d0ed406e28f89cbde1441782b82b2 diff --git a/qtquickcontrols b/qtquickcontrols index 25d6bd04..6c9f0bfc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 25d6bd04611837cbc81f6a1247c3008f08ed9f9d +Subproject commit 6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 937f82c8..c924a94f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 937f82c8fe6efa9b22449a5d51f1006da1513c10 +Subproject commit c924a94fb5077028965e2c6343e1bafabc0e69f8 diff --git a/qtremoteobjects b/qtremoteobjects index 7f7f1b46..db6d07b4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7f7f1b46dc0e517d61b66d01640ffba363495192 +Subproject commit db6d07b4a51813e72eee474a6ee2e91438841fa7 diff --git a/qtscript b/qtscript index 047d82ac..781c7452 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 047d82ac1e84c0e046f643b2267c3c4453148896 +Subproject commit 781c745277f9b4faa87d341b10ec0ca46eb45a73 diff --git a/qtscxml b/qtscxml index c043ebeb..f71a6d1a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c043ebebaba80b32ddb69ed29aa3408549567a6d +Subproject commit f71a6d1a746d5ceb19ce017902c83e1819b5c0ea diff --git a/qtsensors b/qtsensors index d87fdee3..e8588efb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d87fdee381318de4d8db10dd0a502dc9c0965623 +Subproject commit e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b diff --git a/qtserialbus b/qtserialbus index eb5f9325..bfb218c4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit eb5f932539d4146c263eac3c2345f4a9ac6d63e4 +Subproject commit bfb218c46324f89dd435ddfa0dbfe3643fcc2d27 diff --git a/qtserialport b/qtserialport index 1b425f4d..aee027f5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 1b425f4d5a91d9c354b9fa47a9cd61360110e3c7 +Subproject commit aee027f581839caf44de1b176099ef2b22d2fc84 diff --git a/qtspeech b/qtspeech index 859ef7d5..d8bd5329 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 859ef7d5e75e8ad85276f0b7760a9012db42201d +Subproject commit d8bd5329cd4000151051ed25cda005b3b51aec83 diff --git a/qtsvg b/qtsvg index 1333cc27..f4554e29 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1333cc272ff33d864400af970729ffb95cdb8eac +Subproject commit f4554e29a44af2cdd9e518f5931e28cf349883c6 diff --git a/qttools b/qttools index 359dad81..c0bfa2a9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 359dad818d450c015753a822a12ebd1ecbabad34 +Subproject commit c0bfa2a930f6414d41684e578b59872defdffdf9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5f80f66d..9055bd56 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5f80f66d3b5878bba021d4ac67e35388bfe84fdb +Subproject commit 9055bd56653d2e488b52c66d884109fcccd23c2d diff --git a/qtwayland b/qtwayland index 6e4772bf..abfdf34f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6e4772bfb6a2818f05fe1bb8132f96d3f868e3d0 +Subproject commit abfdf34f510b64439c85cc54f47b41c4ce3f9c61 diff --git a/qtwebchannel b/qtwebchannel index 859135f6..01241eb3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 859135f6fa0c4a5f907991168f4076751912c764 +Subproject commit 01241eb3704af785e8d98fb2f6e223ca62a64175 diff --git a/qtwebsockets b/qtwebsockets index 4b517f81..8a549aca 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4b517f81d5db4f452eee5330f8f9db9877909130 +Subproject commit 8a549aca7b371722cbf012d85216e4560ef1cf33 diff --git a/qtwebview b/qtwebview index cd2212f8..cf23a402 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cd2212f828a0e91c2ee7e04f0b7b32aa05880f80 +Subproject commit cf23a402b97b459309ec32fe49c82a845a3636af diff --git a/qtwinextras b/qtwinextras index 7d5fc229..e484402a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7d5fc2299fe6b91ab107428f87dd88386041837a +Subproject commit e484402ad1d9b6d3b89333585b1ead97e4d21635 diff --git a/qtx11extras b/qtx11extras index 8c57d622..78a10dad 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8c57d6220db57866a1c7cc35ac6f902225c28095 +Subproject commit 78a10dad08d1c354f7afb539bd89f0d75a9fe3b1 diff --git a/qtxmlpatterns b/qtxmlpatterns index 51ab06a8..c892ceec 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 51ab06a84a03a3d11e175f1d681ee620c41b4c20 +Subproject commit c892ceec1c301f12d5c276e12be0bee8fd7d4cbf From 884490eaaec3b3a150b4262aee3a318dda2ea2c3 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Fri, 2 Feb 2018 07:23:23 +0200 Subject: [PATCH 24/25] Add RTA targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release Test Automation tests are ran also in additional targets compared to qt5 targets. Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe Reviewed-by: Aapo Keskimolo Reviewed-by: Heikki Halmet Reviewed-by: Simo Fält --- coin/platform_configs/tqtc-qt-rta.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 coin/platform_configs/tqtc-qt-rta.txt diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt new file mode 100644 index 00000000..5453a022 --- /dev/null +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -0,0 +1,5 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic + From c64b2415d326f21119399b76549ef9de3195b538 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 15 Feb 2018 16:15:46 +0100 Subject: [PATCH 25/25] init-repo: complain about non-option arguments otherwise abuse may go unnoticed (at this stage ...). Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d Reviewed-by: Edward Welbourne --- init-repository | 1 + 1 file changed, 1 insertion(+) diff --git a/init-repository b/init-repository index 11a75ffd..875aec2b 100755 --- a/init-repository +++ b/init-repository @@ -243,6 +243,7 @@ sub parse_arguments $self->{'mirror-url'} = $OSLO_MIRROR_URL_BASE; }, ) || printUsage(2); + @ARGV && printUsage(2); # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/};