From 87a4180718cb841873acb2b5d98231d55c668157 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 6 Mar 2017 16:25:21 +0100 Subject: [PATCH 01/11] Update submodules on '5.9' in qt5 Change-Id: Idad0e50dd673356a7ed27d7c7c978ba10229b71a Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index ff6089ac..f13d072a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ff6089aca0ec77c6304a04de268e6d27e97d6c32 +Subproject commit f13d072a12d53e489f2647916a119878ea8208bb diff --git a/qtbase b/qtbase index 593a707b..80cbe307 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 593a707ba35c22c0a1061dce745deceed8837f80 +Subproject commit 80cbe30798fbc3219f2331f1b5f746dfe57b5c32 diff --git a/qtcharts b/qtcharts index e0ba5ac9..0710788e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e0ba5ac91dbb1fe3611118239c00ea8d748e5678 +Subproject commit 0710788e783ed53589d33ec527cfd359087c51be diff --git a/qtdatavis3d b/qtdatavis3d index fc946bae..7d278e3b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fc946bae2969cacb3ffa822ab033231ea1185b2d +Subproject commit 7d278e3bcfc27b4ad06f500a406c5b8ff18953de diff --git a/qtdeclarative b/qtdeclarative index 71a2dbed..7fe0d1a0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 71a2dbed467be0041b6793dda868655b2632e830 +Subproject commit 7fe0d1a06830518e8ce6752e45a0a01b1b97fa73 diff --git a/qtimageformats b/qtimageformats index d2306d74..f2dbc67c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d2306d74850986692c02b70df0d7a6a6e933d0dc +Subproject commit f2dbc67c2b032a5f27d0224e020fb6dfcd3fd142 diff --git a/qtlocation b/qtlocation index e463bf8f..c580d990 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e463bf8f4ae1eb94b4f91cb6ebca4b198e86bccd +Subproject commit c580d99097763d915a8fc1479060e3f6b0a00147 diff --git a/qtquickcontrols b/qtquickcontrols index ba81daa6..9de38898 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ba81daa6f58992f0724f0a43590fae3453d3948e +Subproject commit 9de38898312c5dccb1a57b093a6cbfe5b6ed4f77 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index eb082fe7..8732b068 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit eb082fe715e23f55d24b3cf7528857167831f578 +Subproject commit 8732b0681b99e5de01d6f53de33306ca70b01171 diff --git a/qtscxml b/qtscxml index 63904309..df59576f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 63904309552bc6dd39fcfda086b81c1b9bee0a08 +Subproject commit df59576f11705e0075d004ffcc0ac77e53475a3c diff --git a/qtserialbus b/qtserialbus index 38703176..15d3834f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 38703176f77ededf1b44946a6c38d6998c5e6796 +Subproject commit 15d3834f6dbe319827abdbdb92383846dd7cac3c diff --git a/qttools b/qttools index ce8ad09e..4f6d0ee8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ce8ad09e69d5732787312c362464a3ce0c5fa582 +Subproject commit 4f6d0ee8743f57d29e6f1fd13440c7242bea6134 diff --git a/qtwayland b/qtwayland index a259232f..ab6f6538 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a259232f3a661b8916497b056cb3d50c396c3d94 +Subproject commit ab6f6538aac8e9b8c49c0899d44d091219470603 diff --git a/qtwebengine b/qtwebengine index 352115e2..5c847f10 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 352115e2aeb8ba8c2bf4897f40b9e26555b7c80c +Subproject commit 5c847f10affda81210b45fbaa884c2eb46a16604 From a5330bb63220b461898177efabff7fd9785d9bb0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 14 Feb 2017 14:57:14 +0100 Subject: [PATCH 02/11] Add ForceDebugInfo to MSVC platforms Create release debug information for MSVC configurations for which we build packages. Also, for hard-to-reproduce autotest crashes in the CI enabling ForceDebugInfo is crucial to get a meaningful backtrace. Task-number: QTBUG-3934 Change-Id: Ie4ea7b9c6aa251a12796621817d8e3411bbed81d Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 70495e76..ddebdde6 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-10-x86_64 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-7-x86 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo From ec763635fa6399e0f5522d35fc97dabe200a1b2a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 9 Mar 2017 11:45:56 +0100 Subject: [PATCH 03/11] Update submodules on '5.9' in qt5 Change-Id: Id75b75b5dff01db70f87c0f72648bd158e6465dd Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index f13d072a..e76fabc8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f13d072a12d53e489f2647916a119878ea8208bb +Subproject commit e76fabc8f1349d0eddf725453fc188d2ae0bf77e diff --git a/qtbase b/qtbase index 80cbe307..175f33ed 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 80cbe30798fbc3219f2331f1b5f746dfe57b5c32 +Subproject commit 175f33ed855b0a8a30daafacd4f48fa3f8e76a9b diff --git a/qtconnectivity b/qtconnectivity index 402cbe22..9a4ca926 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 402cbe22407133a38e319af7af676e68708c577d +Subproject commit 9a4ca9260dc92bb5e1e96c7d66639661e4ea8808 diff --git a/qtdeclarative b/qtdeclarative index 7fe0d1a0..e0add0b6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7fe0d1a06830518e8ce6752e45a0a01b1b97fa73 +Subproject commit e0add0b655941dcec483674594b63ce9775598be diff --git a/qtlocation b/qtlocation index c580d990..919c4415 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c580d99097763d915a8fc1479060e3f6b0a00147 +Subproject commit 919c4415d0dc06177d8f3c2a300549d62a8dcdd4 diff --git a/qtmultimedia b/qtmultimedia index ed8f90d0..eb5a5084 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ed8f90d0e47bd4ade7be3852627395ac66ba32ea +Subproject commit eb5a508497dbb7acc3a056d02fc629f70dd0033b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8732b068..abc657ad 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8732b0681b99e5de01d6f53de33306ca70b01171 +Subproject commit abc657ada6377d12e919113699da6e6960633516 diff --git a/qtremoteobjects b/qtremoteobjects index 2c7268a3..e7f93cd6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2c7268a3360d8174c34b037564a721971ec67677 +Subproject commit e7f93cd651f7a7f47821968169fc80ae4126a2ad diff --git a/qtserialbus b/qtserialbus index 15d3834f..f5338617 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 15d3834f6dbe319827abdbdb92383846dd7cac3c +Subproject commit f5338617ed81a740493d4006b185572a37ccb45d diff --git a/qttools b/qttools index 4f6d0ee8..7f8c49d3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4f6d0ee8743f57d29e6f1fd13440c7242bea6134 +Subproject commit 7f8c49d3dd0d4bd06ab57a71c7e2957aa5c224aa diff --git a/qtwayland b/qtwayland index ab6f6538..60a3ae65 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ab6f6538aac8e9b8c49c0899d44d091219470603 +Subproject commit 60a3ae6559c3d53ef936c5f90182d53b1a7fea24 diff --git a/qtwebengine b/qtwebengine index 5c847f10..7773a412 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c847f10affda81210b45fbaa884c2eb46a16604 +Subproject commit 7773a412e5fd072a4edb1e957f2857130ea07a3c From 2d59a20361c34ba6b541b08206b32ab24bb6b073 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 9 Mar 2017 12:45:43 +0100 Subject: [PATCH 04/11] Fix network test server setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the correct IP address for the network test server that all the other machines are using as well. Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f Task-number: QTBUG-59241 Reviewed-by: Timur Pocheptsov Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh index 06f44049..1881ae0b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -38,7 +38,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" -NTS_IP=10.212.2.0 +NTS_IP=10.212.2.216 ExceptionGsettings1=100 ExceptionGsettings2=101 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh index 000c8c0a..48430389 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" VNCPassword=qt -NTS_IP=10.212.2.0 +NTS_IP=10.212.2.216 ExceptionDisableScreensaver=100 ExceptionSetInitialDelay=101 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh index 399ae47e..47bf03f8 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" VNCPassword=qt -NTS_IP=10.212.2.0 +NTS_IP=10.212.2.216 ExceptionDisableScreensaver=100 ExceptionSetInitialDelay=101 From f7694572d89e99822e8bede87fd476ea80e1281e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Mar 2017 22:32:02 +0100 Subject: [PATCH 05/11] Update submodules on '5.9' in qt5 Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index e76fabc8..9675579a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e76fabc8f1349d0eddf725453fc188d2ae0bf77e +Subproject commit 9675579a6d7955b0b278a54050f6f503e2b10b1a diff --git a/qtactiveqt b/qtactiveqt index c0d93d40..d79b3964 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c0d93d408d4eafcaab06d455b8c3ce1e2c21f8db +Subproject commit d79b396442753f71b8e498a991c7dd85538c7505 diff --git a/qtandroidextras b/qtandroidextras index 3f9e9244..f0561e64 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3f9e924417c13f2026fda503a1620f517370466d +Subproject commit f0561e640a488fa1870cacaae897133c7fdf6362 diff --git a/qtbase b/qtbase index 175f33ed..df40b111 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 175f33ed855b0a8a30daafacd4f48fa3f8e76a9b +Subproject commit df40b1115db600e8de1c4774476fa30956a34fd9 diff --git a/qtcanvas3d b/qtcanvas3d index 3ac87eeb..ca69fc96 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 3ac87eeb59dd7ec0351d76a05dd7cfa22a274e5e +Subproject commit ca69fc961724d3a31c90e29ce3a7618b94b7c21c diff --git a/qtcharts b/qtcharts index 0710788e..54c920f3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0710788e783ed53589d33ec527cfd359087c51be +Subproject commit 54c920f3735d5302e1f6af7768c6a06f1dcd333f diff --git a/qtconnectivity b/qtconnectivity index 9a4ca926..a983457e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9a4ca9260dc92bb5e1e96c7d66639661e4ea8808 +Subproject commit a983457e2280af1a1d7f5d5b94540d5648daca18 diff --git a/qtdatavis3d b/qtdatavis3d index 7d278e3b..a29f9af1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7d278e3bcfc27b4ad06f500a406c5b8ff18953de +Subproject commit a29f9af154aca4a88be3df46641762a289556693 diff --git a/qtdeclarative b/qtdeclarative index e0add0b6..77e0dc04 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e0add0b655941dcec483674594b63ce9775598be +Subproject commit 77e0dc0485953427320ed0b442ba24eef4f9d73b diff --git a/qtdoc b/qtdoc index 7c7607b2..6fe77f0a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7c7607b2f26548734a05b8d6fb74ce0a6fa664e4 +Subproject commit 6fe77f0a29431e3943ceb84621e2f5133c2e25d5 diff --git a/qtgamepad b/qtgamepad index fdce0bd4..951b5fb5 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit fdce0bd433f4a219a371db4091b18cc48209b04f +Subproject commit 951b5fb5e39df3caa09b5e52292b1ac22c4dfe03 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a3a229bd..b934d46c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a3a229bd2ace8fc4f874304e60cf1cb74f294d71 +Subproject commit b934d46c2255391ea2b301974542bc0190bf5f72 diff --git a/qtlocation b/qtlocation index 919c4415..dca17545 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 919c4415d0dc06177d8f3c2a300549d62a8dcdd4 +Subproject commit dca175454aefdd019952d941c6369c314e8c3b11 diff --git a/qtmultimedia b/qtmultimedia index eb5a5084..e964e893 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit eb5a508497dbb7acc3a056d02fc629f70dd0033b +Subproject commit e964e89331f2cfef99a3f63172a127b6c02a9727 diff --git a/qtnetworkauth b/qtnetworkauth index 279adce9..8847f1e5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 279adce9bb578749161899bfe82cfb6c8b9b6f0a +Subproject commit 8847f1e54d27c43ef744c39d28033e48764a254a diff --git a/qtpurchasing b/qtpurchasing index 00c6b792..9a492e0f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 00c6b792a95d72a4deb2bb89d0ba8cbb52681998 +Subproject commit 9a492e0f47660b4a428fc1fc6dc0fd07b2b3b1b7 diff --git a/qtquickcontrols b/qtquickcontrols index 9de38898..fb5e2885 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9de38898312c5dccb1a57b093a6cbfe5b6ed4f77 +Subproject commit fb5e28850a1cdf86cecea1151ee68da35f759184 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index abc657ad..5461df15 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit abc657ada6377d12e919113699da6e6960633516 +Subproject commit 5461df158c6076d3c3ed037e3051778018da7762 diff --git a/qtscript b/qtscript index 61d135d1..5cde7e86 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 61d135d1c0ae52a756cf62144210fa73c9ea5526 +Subproject commit 5cde7e8668c0d8729674e4fdd96ee6de52e6c2c3 diff --git a/qtscxml b/qtscxml index df59576f..8ce3ea59 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit df59576f11705e0075d004ffcc0ac77e53475a3c +Subproject commit 8ce3ea59e86f349d2505c97de28f817bccc11480 diff --git a/qtserialport b/qtserialport index 1340fede..d99b4cf6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 1340fedecd841765485beffa7c93320c96f21cdc +Subproject commit d99b4cf607827bebd62475ed419bd6765a3b1d0b diff --git a/qtspeech b/qtspeech index 5135fefe..e4ec1fc2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5135fefe90b7a5ff9bebe012ed4f1688fe096f93 +Subproject commit e4ec1fc2f7f2399547b66bc2cb51c33c17f1cd4d diff --git a/qtsvg b/qtsvg index 7cc50e97..be428b21 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7cc50e972b7fa546f7cedff2ef19db20af9e36ab +Subproject commit be428b21b777a04a1766adb880cb44e7b0b68e5a diff --git a/qttools b/qttools index 7f8c49d3..451adafb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7f8c49d3dd0d4bd06ab57a71c7e2957aa5c224aa +Subproject commit 451adafbc52c8f7a13854821c9d69efd37dfcc6a diff --git a/qtwebchannel b/qtwebchannel index 196097bf..4a95a4e6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 196097bfc84d297199ea591fc19e714c88796e8e +Subproject commit 4a95a4e603e1bfd8e365274a5888dcdbb6bb42e7 diff --git a/qtwebengine b/qtwebengine index 7773a412..95621e44 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7773a412e5fd072a4edb1e957f2857130ea07a3c +Subproject commit 95621e44c4234872aaa827885c5ffedee4e73807 diff --git a/qtwebkit b/qtwebkit index 0b30e449..5a249af4 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 0b30e4490f7500ade1868fb33cea8705418c90bb +Subproject commit 5a249af4e4ba392904bc7b0f3e103bb87ad540f6 diff --git a/qtwebkit-examples b/qtwebkit-examples index c858361f..822426ab 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit c858361fb202c201f8c45e2072d913dc7f31ec8e +Subproject commit 822426abc77a74752b0ee0da4d0a1c106c4dac22 diff --git a/qtwebsockets b/qtwebsockets index 1af97a5f..91582c53 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1af97a5f04d4d7d0dbf9954397e2374a791d717b +Subproject commit 91582c53c5c3b404169ce2a44d75ac8102043513 diff --git a/qtwebview b/qtwebview index 0218b634..f7f8f8f6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0218b63446186b659333bd3cbfd6f69ed172299b +Subproject commit f7f8f8f6c12b8617b4d9f89dd2aaaf241a1a6f8e diff --git a/qtwinextras b/qtwinextras index c5159ecf..5ee8cb18 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit c5159ecfc36bc0f9bff45de78accd104b9637066 +Subproject commit 5ee8cb180c182e00ca2520f2da28535c9ce117d3 diff --git a/qtx11extras b/qtx11extras index 5ecce026..8c44529e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5ecce026f65b2fb320379e49e70f772ad2bbba69 +Subproject commit 8c44529ed5269bc2130c27ba9733d262143424ed diff --git a/qtxmlpatterns b/qtxmlpatterns index a5b1e6e3..15c0b967 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a5b1e6e35e32719647c7f9b3de3953838d40d805 +Subproject commit 15c0b967295b4be41c881335fe602c1afec65aec From 88e87fe7d372e83ed7642617600d192282a9ce5b Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 13 Mar 2017 13:42:19 +0100 Subject: [PATCH 06/11] Recommend qtquickcontrols2 for qtlocation The MapViewer example now uses qtquickcontrols2 sliders. This patch adds the related dependency Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d Reviewed-by: Alex Blasche --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 05660dba..f3230e8d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -93,7 +93,7 @@ priority = 50 [submodule "qtlocation"] depends = qtbase - recommends = qtdeclarative qtquickcontrols qtserialport + recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git branch = 5.9 From b14198730d4b558d54ac4a972b4d203d2866959a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 1 Mar 2017 08:07:39 +0200 Subject: [PATCH 07/11] Remove command line tools from macOS 10.11 and 10.12 Qt should not require command line tools to be installed. When they are installed, we can accidentally rely on on the tools instead of sysroot. Task-number: QTBUG-58325 Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800 Reviewed-by: Simon Hausmann --- .../qtci-macos-10.12-x86_64/020-xcode.sh | 8 ++ .../021-commandlinetools.sh | 111 ------------------ .../qtci-osx-10.11-x86_64/020-xcode.sh | 8 ++ .../021-commandlinetools.sh | 111 ------------------ 4 files changed, 16 insertions(+), 222 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index 260f18aa..070ed049 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -50,6 +50,7 @@ ExceptionSHA1=101 ExceptionUnXZ=102 ExceptionCPIO=103 ExceptionDelete=104 +ExceptionAcceptLicense=105 url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz @@ -73,6 +74,9 @@ try echo "Deleting '${targetFile%.*}'" rm "${targetFile%.*}" || throw $ExceptionDelete + echo "Accept license" + sudo xcodebuild -license accept || throw $ExceptionAcceptLicense + echo "XCode = 8.2.1" >> ~/versions.txt ) catch || { @@ -97,6 +101,10 @@ catch || { echo "Failed to delete temporary file." exit 1; ;; + $ExceptionAcceptLicense) + echo "Failed to accept license." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh deleted file mode 100755 index e90904fd..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 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 Command Line Tools for Xcode -# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache - -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" - -ExceptionDownloadUrl=100 -ExceptionSHA1=101 -ExceptionAttachImage=102 -ExceptionInstall=103 -ExceptionDetachImage=104 -ExceptionRemoveTmpFile=105 -ExceptionAcceptLicense=106 - - -url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg -targetFile=/tmp/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg -expectedSha1=0a55c5682c18879cfff7761619adb769ea396a79 - -try -( - echo "Downloading Command Line Tools from URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl - - echo "Checking SHA1 on '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 - - echo Mounting DMG - hdiutil attach "$targetFile" || throw $ExceptionAttachImage - - echo Installing Command Line Tools - (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS Sierra version 10.12).pkg" -target /) || throw $ExceptionInstall - - hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage - - echo "Removing temporary file '$targetFile'" - rm "$targetFile" || throw $ExceptionRemoveTmpFile - - echo "Accept license" - sudo xcodebuild -license accept || throw $ExceptionAcceptLicense - - echo "Command Line Tools = 8.2" >> ~/versions.txt -) -catch || { - case $ex_code in - $ExceptionDownloadUrl) - echo "Failed to download Command Line Tools from form URL '$url'." - exit 1; - ;; - $ExceptionSHA1) - echo "Failed to check SHA1." - exit 1; - ;; - $ExceptionAttachImage) - echo "Failed to attach image." - exit 1; - ;; - $ExceptionInstall) - echo "Failed to install Command Line Tools." - exit 1; - ;; - $ExceptionDetachImage) - echo "Failed to detach image." - exit 1; - ;; - $ExceptionRemoveTmpFile) - echo "Failed to remove temporary file." - exit 1; - ;; - $ExceptionAcceptLicense) - echo "Failed to accept license." - exit 1; - ;; - - esac -} diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index dc02ae14..44453e55 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -52,6 +52,7 @@ ExceptionSHA1=101 ExceptionUnXZ=102 ExceptionCPIO=103 ExceptionDelete=104 +ExceptionAcceptLicense=105 url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz @@ -75,6 +76,9 @@ try echo "Deleting '${targetFile%.*}'" rm "${targetFile%.*}" || throw $ExceptionDelete + echo "Accept license" + sudo xcodebuild -license accept || throw $ExceptionAcceptLicense + echo "Xcode = 8.2" >> ~/versions.txt ) catch || { @@ -99,6 +103,10 @@ catch || { echo "Failed to delete temporary file." exit 1; ;; + $ExceptionAcceptLicense) + echo "Failed to accept license." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh deleted file mode 100755 index 8a8e921c..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 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 Command Line Tools for Xcode -# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache - -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" - -ExceptionDownloadUrl=100 -ExceptionSHA1=101 -ExceptionAttachImage=102 -ExceptionInstall=103 -ExceptionDetachImage=104 -ExceptionRemoveTmpFile=105 -ExceptionAcceptLicense=106 - - -url=http://ci-files01-hki.ci.local/input/mac/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg -targetFile=/tmp/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg -expectedSha1=4df615ca765ac1a1e681ddcbca79fc15990e3b25 - -try -( - echo "Downloading Command Line Tools from URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl - - echo "Checking SHA1 on '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 - - echo Mounting DMG - hdiutil attach "$targetFile" || throw $ExceptionAttachImage - - echo Installing Command Line Tools - (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS El Capitan version 10.11).pkg" -target /) || throw $ExceptionInstall - - hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage - - echo "Removing temporary file '$targetFile'" - rm "$targetFile" || throw $ExceptionRemoveTmpFile - - echo "Accept license" - sudo xcodebuild -license accept || throw $ExceptionAcceptLicense - - echo "Command Line Tools = 8.2" >> ~/versions.txt -) -catch || { - case $ex_code in - $ExceptionDownloadUrl) - echo "Failed to download Command Line Tools from form URL '$url'." - exit 1; - ;; - $ExceptionSHA1) - echo "Failed to check SHA1." - exit 1; - ;; - $ExceptionAttachImage) - echo "Failed to attach image." - exit 1; - ;; - $ExceptionInstall) - echo "Failed to install Command Line Tools." - exit 1; - ;; - $ExceptionDetachImage) - echo "Failed to detach image." - exit 1; - ;; - $ExceptionRemoveTmpFile) - echo "Failed to remove temporary file." - exit 1; - ;; - $ExceptionAcceptLicense) - echo "Failed to accept license." - exit 1; - ;; - - esac -} From 3e35991013c6ae29d213614a923f50afcc6f305a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 15 Mar 2017 14:09:05 +0100 Subject: [PATCH 08/11] Install g++-multilib on Ubuntu 16.04 platforms This is needed to cross-build to 32bit x86 which WebEngine needs for Boot2Qt ARM builds. Task-number: QTBUG-59504 Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index b727659f..8b28c981 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -80,6 +80,8 @@ try # Install libraries needed for QtMultimedia to be able to support all plugins sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + # Support for cross-building to x86 (needed by WebEngine boot2qt builds) + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT ) catch || { case $ex_code in From e193001bca40aa3c1de622f4cf4e283ae5019894 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Mar 2017 08:32:57 +0100 Subject: [PATCH 09/11] Update submodules on '5.9' in qt5 Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qt3d b/qt3d index 9675579a..a49b335b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9675579a6d7955b0b278a54050f6f503e2b10b1a +Subproject commit a49b335bd5f1708c95d534fc166758bcbfb2f231 diff --git a/qtbase b/qtbase index df40b111..99adabdb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit df40b1115db600e8de1c4774476fa30956a34fd9 +Subproject commit 99adabdb7ecdded792961392cec6b68e625bf6e2 diff --git a/qtcharts b/qtcharts index 54c920f3..d7d8bb10 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 54c920f3735d5302e1f6af7768c6a06f1dcd333f +Subproject commit d7d8bb10b6d4413376624a85760df857096955cb diff --git a/qtconnectivity b/qtconnectivity index a983457e..51914eff 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a983457e2280af1a1d7f5d5b94540d5648daca18 +Subproject commit 51914eff36cb99823757bf2c970df46081351d32 diff --git a/qtdeclarative b/qtdeclarative index 77e0dc04..aa570a77 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 77e0dc0485953427320ed0b442ba24eef4f9d73b +Subproject commit aa570a7720dc508f83c32aee81ac1d6ea21d6757 diff --git a/qtdoc b/qtdoc index 6fe77f0a..9c532225 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6fe77f0a29431e3943ceb84621e2f5133c2e25d5 +Subproject commit 9c5322256604f6870233e6cd57a1a0fe0a6ccb23 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index b934d46c..69bb8a63 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit b934d46c2255391ea2b301974542bc0190bf5f72 +Subproject commit 69bb8a63a5ff1a56629d58e4d03a3bee658c5447 diff --git a/qtimageformats b/qtimageformats index f2dbc67c..c7a6a451 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f2dbc67c2b032a5f27d0224e020fb6dfcd3fd142 +Subproject commit c7a6a451a5c277556e28dfb3b4b943719cdda7ff diff --git a/qtlocation b/qtlocation index dca17545..e7b02ce3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit dca175454aefdd019952d941c6369c314e8c3b11 +Subproject commit e7b02ce343bf0b772ae2ef86f4e900e8af26c03b diff --git a/qtmacextras b/qtmacextras index a931d079..a26ed957 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a931d0799b46123422582635b79d217eee0ae6bd +Subproject commit a26ed9570c95f2315a2fc0b0f58d2cfebe955a00 diff --git a/qtmultimedia b/qtmultimedia index e964e893..03560060 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e964e89331f2cfef99a3f63172a127b6c02a9727 +Subproject commit 03560060a1702af5190b60fec74f9e71b3c2e104 diff --git a/qtquickcontrols b/qtquickcontrols index fb5e2885..b7ce67c2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fb5e28850a1cdf86cecea1151ee68da35f759184 +Subproject commit b7ce67c2774197026885e500e9ef495460eb0d33 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5461df15..9df0f8cb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5461df158c6076d3c3ed037e3051778018da7762 +Subproject commit 9df0f8cb35ee1c134f772f432272e6e020bf9c52 diff --git a/qtremoteobjects b/qtremoteobjects index e7f93cd6..90261c98 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e7f93cd651f7a7f47821968169fc80ae4126a2ad +Subproject commit 90261c984e9f45fb3c54604900d26099b9d56304 diff --git a/qtscxml b/qtscxml index 8ce3ea59..34e9418c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8ce3ea59e86f349d2505c97de28f817bccc11480 +Subproject commit 34e9418cd669a706dd407f0032c5de564212369e diff --git a/qtsensors b/qtsensors index 5863c695..57465ced 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5863c695ee8eef2976026dea876e37b8978d0c7a +Subproject commit 57465cedf68a98d6705191282007c7aae44c3148 diff --git a/qtserialbus b/qtserialbus index f5338617..71a31bf1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f5338617ed81a740493d4006b185572a37ccb45d +Subproject commit 71a31bf19bb0cce506638bc79ba96bc5e5da92fe diff --git a/qttools b/qttools index 451adafb..c5e54d58 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 451adafbc52c8f7a13854821c9d69efd37dfcc6a +Subproject commit c5e54d58e8763898db81e1f3b5b5460d6e4b9455 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 18f37cf7..956a6a04 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 18f37cf7410beb698855a38a1af458d51d64e3fe +Subproject commit 956a6a04a7a98be7c05320b504674260b4322851 diff --git a/qtwayland b/qtwayland index 60a3ae65..dfcda81c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 60a3ae6559c3d53ef936c5f90182d53b1a7fea24 +Subproject commit dfcda81c5b13ad15517a37bcc45f3bf5f550466c diff --git a/qtwebengine b/qtwebengine index 95621e44..ba644fdd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 95621e44c4234872aaa827885c5ffedee4e73807 +Subproject commit ba644fdd92f1e1871b33af74999f8f6a7f5f6eaf diff --git a/qtwebkit b/qtwebkit index 5a249af4..54110a07 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5a249af4e4ba392904bc7b0f3e103bb87ad540f6 +Subproject commit 54110a075ed5eba337e3463d33ad45b538d9365a diff --git a/qtwinextras b/qtwinextras index 5ee8cb18..7be0ff7f 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5ee8cb180c182e00ca2520f2da28535c9ce117d3 +Subproject commit 7be0ff7fe32ef01839de4ad0a8142ca05438b500 diff --git a/qtxmlpatterns b/qtxmlpatterns index 15c0b967..7c92929b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 15c0b967295b4be41c881335fe602c1afec65aec +Subproject commit 7c92929b7611d873df34434151fe28ae88daed4f From 6d8560c63fa434e8d6b9c77bef3363c8151661ce Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 19 Mar 2017 07:32:10 +0100 Subject: [PATCH 10/11] Update submodules on '5.9' in qt5 Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtserialport | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index a49b335b..fd39bbac 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a49b335bd5f1708c95d534fc166758bcbfb2f231 +Subproject commit fd39bbaca2fe8e29bb9b603340ed94c7480b6da5 diff --git a/qtbase b/qtbase index 99adabdb..c1a2f97a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 99adabdb7ecdded792961392cec6b68e625bf6e2 +Subproject commit c1a2f97a3b3a8c058b1760b57e5c83bf7815b84a diff --git a/qtdatavis3d b/qtdatavis3d index a29f9af1..fb9e6618 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a29f9af154aca4a88be3df46641762a289556693 +Subproject commit fb9e66188e0582a6b80ad3b8b3ac80024180a9df diff --git a/qtdeclarative b/qtdeclarative index aa570a77..7a125135 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aa570a7720dc508f83c32aee81ac1d6ea21d6757 +Subproject commit 7a125135e1ef592aa20a29f7aac1a6117a6b1770 diff --git a/qtgamepad b/qtgamepad index 951b5fb5..b8426f8c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 951b5fb5e39df3caa09b5e52292b1ac22c4dfe03 +Subproject commit b8426f8cd14ba551f43fcf4f3cce4990c9ef0477 diff --git a/qtlocation b/qtlocation index e7b02ce3..51052caa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e7b02ce343bf0b772ae2ef86f4e900e8af26c03b +Subproject commit 51052caaa27c639c10f7618a853d0b374720c6ea diff --git a/qtserialport b/qtserialport index d99b4cf6..5c6a433d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d99b4cf607827bebd62475ed419bd6765a3b1d0b +Subproject commit 5c6a433d6a6a4176082036ae94931467101a199a diff --git a/qtwebengine b/qtwebengine index ba644fdd..8aa508d2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ba644fdd92f1e1871b33af74999f8f6a7f5f6eaf +Subproject commit 8aa508d2e5d39fef9dacb1494ca6fdc94d50efaa From bee0c1b12f7e76f6ef1a0756f67d60a400838fd4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Mar 2017 14:25:38 +0200 Subject: [PATCH 11/11] Update submodules on '5.9' in qt5 Change-Id: Iefd15fd52d2300981820cb1b067f512228100503 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index fd39bbac..dcf35b5c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fd39bbaca2fe8e29bb9b603340ed94c7480b6da5 +Subproject commit dcf35b5cc8a23fa01e6496694e944501e92ea42e diff --git a/qtbase b/qtbase index c1a2f97a..15fe60cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c1a2f97a3b3a8c058b1760b57e5c83bf7815b84a +Subproject commit 15fe60cfdada84ea519f08e905d59cc3fb6d20cd diff --git a/qtdatavis3d b/qtdatavis3d index fb9e6618..1a4d36af 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fb9e66188e0582a6b80ad3b8b3ac80024180a9df +Subproject commit 1a4d36afc821d745fe304f222e73d6c2fa249afa diff --git a/qtdeclarative b/qtdeclarative index 7a125135..e2863c80 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7a125135e1ef592aa20a29f7aac1a6117a6b1770 +Subproject commit e2863c80fed06104eedfe83bce2737f2d24908a6 diff --git a/qtdoc b/qtdoc index 9c532225..64eaa17f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9c5322256604f6870233e6cd57a1a0fe0a6ccb23 +Subproject commit 64eaa17f22bce9804266f49a8e84ef1f041a061c diff --git a/qtlocation b/qtlocation index 51052caa..bd63a1c5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 51052caaa27c639c10f7618a853d0b374720c6ea +Subproject commit bd63a1c5144945c134674e2b253afe26673ca13f diff --git a/qtmultimedia b/qtmultimedia index 03560060..6c3b0fdb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 03560060a1702af5190b60fec74f9e71b3c2e104 +Subproject commit 6c3b0fdb5ceb9079241cb7136d756e9dba114cfe diff --git a/qtquickcontrols b/qtquickcontrols index b7ce67c2..b84d25b2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7ce67c2774197026885e500e9ef495460eb0d33 +Subproject commit b84d25b20ed316529ae2fa091c5d9e2fbf45e023 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9df0f8cb..9a8881bf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9df0f8cb35ee1c134f772f432272e6e020bf9c52 +Subproject commit 9a8881bf3eca6d4589c056908fd3541c1a2a6eb5 diff --git a/qtremoteobjects b/qtremoteobjects index 90261c98..4b65644d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 90261c984e9f45fb3c54604900d26099b9d56304 +Subproject commit 4b65644d0f76773e9e2702d5737cc1c7fe9c64e6 diff --git a/qtrepotools b/qtrepotools index ae6a386f..91471704 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 +Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 diff --git a/qtscript b/qtscript index 5cde7e86..adec1e10 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5cde7e8668c0d8729674e4fdd96ee6de52e6c2c3 +Subproject commit adec1e10f6a54d78c3c1e8944263787931fffc9f diff --git a/qtscxml b/qtscxml index 34e9418c..06ee5829 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 34e9418cd669a706dd407f0032c5de564212369e +Subproject commit 06ee5829c54e1aafeb03d387a8f5d6377a7ed115 diff --git a/qttools b/qttools index c5e54d58..ef4e761c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c5e54d58e8763898db81e1f3b5b5460d6e4b9455 +Subproject commit ef4e761c7519449ff9bb0d0b14bd50c03228a39e diff --git a/qtwayland b/qtwayland index dfcda81c..1e1785c8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dfcda81c5b13ad15517a37bcc45f3bf5f550466c +Subproject commit 1e1785c8d2b077c34a8ca1d4f93e5a75b269eac8 diff --git a/qtwebengine b/qtwebengine index 8aa508d2..817c117c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8aa508d2e5d39fef9dacb1494ca6fdc94d50efaa +Subproject commit 817c117cf89f15e1877107597c8daeff956fd1a6