From 7c6f78a52e3193772614abafd4707b83083d8f15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 Aug 2018 04:34:34 +0300 Subject: [PATCH 01/20] Update submodules on '5.11' in qt5 Change-Id: I670025f9dbbdcaa67f211fb6f5dd616b1a428b1c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtserialbus | 2 +- qtwebsockets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 64a560d9..e7063e6c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 64a560d977a0a511ef541d6116d82e7b5c911a92 +Subproject commit e7063e6cc6673857097b865ea386eca6bcd6668f diff --git a/qtserialbus b/qtserialbus index 226bd2f8..60910410 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 226bd2f84c807b5401a82832dafa48d34966052a +Subproject commit 609104101cd859013097831c393a7cf422b18e03 diff --git a/qtwebsockets b/qtwebsockets index b2478bfb..cf41cd16 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b2478bfb1f9cb48e077aeefd7a52be5d74de6437 +Subproject commit cf41cd16a1f156d68f9cb4a84dd77230f29d739f From 07e349546c39b8d1b73e96264e764e09c3a4e656 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 2 Aug 2018 09:52:55 +0300 Subject: [PATCH 02/20] Provisioning: Update QNX packages with security patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that we want to include in CI since out customers will most likely have them installed. Task-number: QTQAINFRA-1535 Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/qnx_660.sh | 4 ++-- coin/provisioning/common/linux/qnx_700.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh | 2 +- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh index 7f6ab063..2add6901 100755 --- a/coin/provisioning/common/linux/qnx_660.sh +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -40,8 +40,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz" -sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz" +sha1="ffcf91489699c42ce9c1d74941f1829531752bbe" folderName="qnx660" targetFile="qnx660.tar.gz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 49fb7243..3c821fec 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" -sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz" +sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh index a645fe56..38fb6103 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 821c513e..74c8dc6b 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" Download $url $url $zip -Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" +Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" From 5088f70e7ca569e7ad6b2ec31615536e1013d2cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 8 Aug 2018 04:33:11 +0300 Subject: [PATCH 03/20] Update submodules on '5.11' in qt5 Change-Id: I990522ab7bca86409285b39aa6a9e5d74df9653c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e7063e6c..bedf50a5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7063e6cc6673857097b865ea386eca6bcd6668f +Subproject commit bedf50a5bb9656a64ec609536366f90929a63c39 diff --git a/qtdeclarative b/qtdeclarative index a30138ca..4ee11c8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a30138cae86268d71415bc88cfba157977f4a442 +Subproject commit 4ee11c8c49e795150d8d065cd3d5d3b39c4aae46 diff --git a/qtdoc b/qtdoc index 979a1170..ffcacbaa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 979a117029f8798e0a905fc8459d6083d237972d +Subproject commit ffcacbaab1918feb6b646c689e25e91b18962726 diff --git a/qtwayland b/qtwayland index a6cfa65e..19001dc7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a6cfa65eae4d15c7ad5e7411d998332179080fbd +Subproject commit 19001dc7c28c750d3dbf0086f5bcac2d11ad592f From fe66f9a9270206656ae49687048e6afd4e708ab6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 9 Aug 2018 04:33:57 +0300 Subject: [PATCH 04/20] Update submodules on '5.11' in qt5 Change-Id: I5513ef5d623e23ec68934cf129efa60eeee58bf2 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 0b10ab79..85f8e910 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0b10ab797fea863ff2c4897b1c4eb993b21b153d +Subproject commit 85f8e910fa484296afd19a4568ba939502d562f7 diff --git a/qtbase b/qtbase index bedf50a5..58b6b723 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bedf50a5bb9656a64ec609536366f90929a63c39 +Subproject commit 58b6b723defd8006c08624d690e32d53db91cc89 diff --git a/qtdoc b/qtdoc index ffcacbaa..a53f1d1a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ffcacbaab1918feb6b646c689e25e91b18962726 +Subproject commit a53f1d1a1c4ef169621a2c838b2fd8d72284f0c2 diff --git a/qttools b/qttools index 6db52757..6edf6314 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6db52757d81870fe547d62e677fa0757fd663fcb +Subproject commit 6edf63144df8662bb3ff787553b183584a533f56 diff --git a/qtwayland b/qtwayland index 19001dc7..bbd16989 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 19001dc7c28c750d3dbf0086f5bcac2d11ad592f +Subproject commit bbd16989e07d6da367f71a4c36234409bf018287 diff --git a/qtwebengine b/qtwebengine index 0c01be81..410c2297 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c01be81920123a3c3456b727efcb2e9593c65df +Subproject commit 410c22978c2add5f9427af08d97356d6e959e412 From f785a27eac1558c2c64ff257982fd580a06acf46 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Aug 2018 04:33:23 +0300 Subject: [PATCH 05/20] Update submodules on '5.11' in qt5 Change-Id: Idc7f48f35f25f8b9373aee159ebf742338bc5a50 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 58b6b723..9742ee68 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 58b6b723defd8006c08624d690e32d53db91cc89 +Subproject commit 9742ee681b6c877f518013a3af1ce1aa0a328d2c diff --git a/qtconnectivity b/qtconnectivity index 9b48eeaa..01bce9f3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9b48eeaa970926a60a886cadd54414f659a0af18 +Subproject commit 01bce9f3329ba617c2bd53601f4a4abbe2cb5d44 diff --git a/qtdeclarative b/qtdeclarative index 4ee11c8c..b5016550 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ee11c8c49e795150d8d065cd3d5d3b39c4aae46 +Subproject commit b50165508996e10a232ee70196a820da06f1af1c diff --git a/qtdoc b/qtdoc index a53f1d1a..95f0ad63 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a53f1d1a1c4ef169621a2c838b2fd8d72284f0c2 +Subproject commit 95f0ad632ba1551974d4eacbd9ae08012a460e46 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4865136b..3061afd9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4865136be9c61aab50c8f30942996bba58a59c3b +Subproject commit 3061afd9bdb952cdfd1b011cf1c10e98bb09a8d9 diff --git a/qtserialbus b/qtserialbus index 60910410..23a4f70d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 609104101cd859013097831c393a7cf422b18e03 +Subproject commit 23a4f70d26ac2c74e695a0138eb1d766918973bb From c5d9951e7f5153e2a98f27bacbb027a7ca9ae8e1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 11 Aug 2018 04:34:12 +0300 Subject: [PATCH 06/20] Update submodules on '5.11' in qt5 Change-Id: If6a2c0aaa5d8c906c5b128780e96e287229b0aa8 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtremoteobjects | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index 85f8e910..3a3fa5db 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 85f8e910fa484296afd19a4568ba939502d562f7 +Subproject commit 3a3fa5db6c4243d77b5b5a65604901f75c898875 diff --git a/qtbase b/qtbase index 9742ee68..e9a8facc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9742ee681b6c877f518013a3af1ce1aa0a328d2c +Subproject commit e9a8facc96ce6d3b8df4832032ca4df9fac6e9d7 diff --git a/qtremoteobjects b/qtremoteobjects index f65fb4a2..7d6ee33d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f65fb4a28d635de83f35c391d694768d5da76a23 +Subproject commit 7d6ee33d5edd7f7c23d899dfc187f41cafe80540 From ff39808a80ec465b34a0f327046a01ef1e02981d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 Aug 2018 04:31:06 +0300 Subject: [PATCH 07/20] Update submodules on '5.11' in qt5 Change-Id: Ic2fbb75fb89fe0d5ef8204a0ca56dbb8c20aa47d Reviewed-by: Qt Submodule Update Bot --- qtquickcontrols2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3061afd9..1876c17c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3061afd9bdb952cdfd1b011cf1c10e98bb09a8d9 +Subproject commit 1876c17c354cf60160f408950bb6e5cc4a4f879e From 53a457820c01ab2f72a8299be40ea978e08ce06e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 Aug 2018 04:31:10 +0000 Subject: [PATCH 08/20] Update submodules on '5.11' in qt5 Change-Id: Ie97b7d21aeb8326256943a646dce4271405f6982 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 3a3fa5db..d3395bf5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3a3fa5db6c4243d77b5b5a65604901f75c898875 +Subproject commit d3395bf51cc2c90e29908f96aba47ee15c291f9f diff --git a/qtactiveqt b/qtactiveqt index e977cfd5..b09610e1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e977cfd5d9d3eddca7c7daba29e54899fd77133b +Subproject commit b09610e10592af6224b64507f1d6d209d4baf6c9 diff --git a/qtbase b/qtbase index e9a8facc..8f185101 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e9a8facc96ce6d3b8df4832032ca4df9fac6e9d7 +Subproject commit 8f1851013363ae22d311881abcb1186949068270 diff --git a/qtqa b/qtqa index 6dc5301b..509c0bd2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6dc5301b5ba37b05711c89ac9d761c75d793f35b +Subproject commit 509c0bd23590e0e39189ed96448263fa248aac67 diff --git a/qtremoteobjects b/qtremoteobjects index 7d6ee33d..d292f1d9 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7d6ee33d5edd7f7c23d899dfc187f41cafe80540 +Subproject commit d292f1d93ffef611a0a6e9f393251785e1e9b779 diff --git a/qtwayland b/qtwayland index bbd16989..b5dfc03a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bbd16989e07d6da367f71a4c36234409bf018287 +Subproject commit b5dfc03a13014bf29d23784bc6802bb06e212558 From c8016c0093e475cbce0e10313737289eb1090adc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 Aug 2018 19:28:17 +0000 Subject: [PATCH 09/20] Update submodules on '5.11' in qt5 Change-Id: If4f598db669ad39d1a0f1042d3666a548aeb3370 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index d3395bf5..0d23715c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d3395bf51cc2c90e29908f96aba47ee15c291f9f +Subproject commit 0d23715c78f5af939d2af471e71fdc63dfd80cff diff --git a/qtbase b/qtbase index 8f185101..d47c287d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8f1851013363ae22d311881abcb1186949068270 +Subproject commit d47c287d70fa7ef5a04c61b1518c988de939f07f diff --git a/qtconnectivity b/qtconnectivity index 01bce9f3..72a48c7d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 01bce9f3329ba617c2bd53601f4a4abbe2cb5d44 +Subproject commit 72a48c7d108e1f3faaab0a03c6d2a6ead16d2bcc diff --git a/qtwebengine b/qtwebengine index 410c2297..1cf852f6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 410c22978c2add5f9427af08d97356d6e959e412 +Subproject commit 1cf852f6312e2918765e30f02657e9ad04e5cdff From 82401c04df2bc637092e1e547c0614fd7782368b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Aug 2018 18:41:04 +0000 Subject: [PATCH 10/20] Update submodules on '5.11' in qt5 Change-Id: I4c4d079e17fbab5d98b35a9f9311052ac036bb64 Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index d47c287d..242ea383 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d47c287d70fa7ef5a04c61b1518c988de939f07f +Subproject commit 242ea38375534f529f155efa46593e2a42577455 diff --git a/qtmultimedia b/qtmultimedia index 02ac3f58..b799d36a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 02ac3f58721bb52db612acd3bb2e2c26bfc3e05b +Subproject commit b799d36a9e543bccd921399e929ef7ad17f15497 diff --git a/qtwebengine b/qtwebengine index 1cf852f6..e56dd7e3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1cf852f6312e2918765e30f02657e9ad04e5cdff +Subproject commit e56dd7e37ea96c4ba1354e319bdaa9d01c401747 From d4479f59f86ec1447f18b5afac3e4be78e3a4219 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Aug 2018 04:31:10 +0000 Subject: [PATCH 11/20] Update submodules on '5.11' in qt5 Change-Id: I78af59a68a665f7dec71495a58bf4c2e9e23ade3 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtlocation | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index 0d23715c..ccfe440c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0d23715c78f5af939d2af471e71fdc63dfd80cff +Subproject commit ccfe440c34479377363679fc890f10b44ee57769 diff --git a/qtbase b/qtbase index 242ea383..29778037 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 242ea38375534f529f155efa46593e2a42577455 +Subproject commit 29778037f8a7b2c86bc4044409b37d5a51a15432 diff --git a/qtlocation b/qtlocation index a8c09973..571126c3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a8c09973f8cc960b9047157ad7e6834032bea0b7 +Subproject commit 571126c3d63f899a67b896886aaec8cf4f0acb1c From 31590c0b65d90c02586527c658d71e83d6d98843 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 May 2018 12:20:19 +0200 Subject: [PATCH 12/20] set QTDIR_build in .qmake.super this suppresses license checking in default_pre.prf in the super module. submodules set it via their .qmake.conf's. Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a Reviewed-by: Joerg Bornemann --- qt.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index af16c6df..9ce0a694 100644 --- a/qt.pro +++ b/qt.pro @@ -1,5 +1,7 @@ # Create the super cache so modules will add themselves to it. -cache(, super) +# Also suppress the license check on subsequent "visits". The first +# visit will skip it anyway due to not having a compiler set up yet. +cache(CONFIG, add super, $$list(QTDIR_build)) TEMPLATE = subdirs From 8a559f20e3c40fcc5ecbba4e76669b242e9002b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Aug 2018 04:30:59 +0000 Subject: [PATCH 13/20] Update submodules on '5.11' in qt5 Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index ccfe440c..295b16da 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ccfe440c34479377363679fc890f10b44ee57769 +Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e diff --git a/qtbase b/qtbase index 29778037..981b16d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29778037f8a7b2c86bc4044409b37d5a51a15432 +Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bf39468a..d8906c5f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bf39468a6368b055335c6b73da65577ec55731ee +Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c diff --git a/qtwayland b/qtwayland index b5dfc03a..334822b7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b5dfc03a13014bf29d23784bc6802bb06e212558 +Subproject commit 334822b742cb15bb27dbc14b45d41e2714eef767 From 79c3ea18ed0effc686a0972767dc56a6084accbb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Aug 2018 04:31:26 +0000 Subject: [PATCH 14/20] Update submodules on '5.11' in qt5 Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 981b16d9..2d3098f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a +Subproject commit 2d3098f77c98a895dad2c2e6c1c3facf712473f5 From f35a0cb742da34516abda0e5d85f8b41ff4ce4ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Aug 2018 04:31:12 +0000 Subject: [PATCH 15/20] Update submodules on '5.11' in qt5 Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 295b16da..d0692c69 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e +Subproject commit d0692c6944599a5561ea07faaa6bddf98e7e2a6e diff --git a/qtbase b/qtbase index 2d3098f7..76c328b2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2d3098f77c98a895dad2c2e6c1c3facf712473f5 +Subproject commit 76c328b2b39617310993ce76e65665943b8c111c diff --git a/qtconnectivity b/qtconnectivity index 72a48c7d..0c2b6dc4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72a48c7d108e1f3faaab0a03c6d2a6ead16d2bcc +Subproject commit 0c2b6dc44351352e8a88248b98e1d45c0403e01c diff --git a/qtdeclarative b/qtdeclarative index b5016550..7c4335d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b50165508996e10a232ee70196a820da06f1af1c +Subproject commit 7c4335d0307abde6dd17738481d006d70771714c diff --git a/qtrepotools b/qtrepotools index 24801f60..ded95025 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 24801f60f05f013f728654d06b35616eec2ef089 +Subproject commit ded9502576543d83ba157eca42515ccd656b25fb diff --git a/qtwebchannel b/qtwebchannel index 1906f624..b4277bf9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1906f62469e608f712c1507dabd74638e38d8075 +Subproject commit b4277bf9bf30f1fc8cba1d6c7185e991e83e6e18 diff --git a/qtwebengine b/qtwebengine index e56dd7e3..dab4814d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e56dd7e37ea96c4ba1354e319bdaa9d01c401747 +Subproject commit dab4814dc4187db345a53b234c4cdd4cbdcf4bce From c3e5f325bb957280e9443e49c45533a42a4666c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Aug 2018 23:30:43 +0200 Subject: [PATCH 16/20] Update submodules on '5.11' in qt5 Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 76c328b2..02b3d43f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76c328b2b39617310993ce76e65665943b8c111c +Subproject commit 02b3d43fd4661271e6e8dc8940d84cb2ba352fe0 diff --git a/qtmultimedia b/qtmultimedia index b799d36a..c1ca9510 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b799d36a9e543bccd921399e929ef7ad17f15497 +Subproject commit c1ca9510af3c3c4134b717f1863651783e338a9e From c620015aacb1b804a4a3128d9405d534a068ddac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Aug 2018 23:30:43 +0200 Subject: [PATCH 17/20] Update submodules on '5.11' in qt5 Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtvirtualkeyboard | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 02b3d43f..dc7e775c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 02b3d43fd4661271e6e8dc8940d84cb2ba352fe0 +Subproject commit dc7e775c9c6ecc66f76af8139b8dfc3ee101c7ff diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d8906c5f..c4079ef5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c +Subproject commit c4079ef585f3efdedc64d961d8ef2bd90cedb7fc From 7b029c8ca2a30a3f63d6b00d62d6f825f89624c6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Aug 2018 13:58:05 +0200 Subject: [PATCH 18/20] Update submodules on '5.11' in qt5 Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index dc7e775c..bd42e2f0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dc7e775c9c6ecc66f76af8139b8dfc3ee101c7ff +Subproject commit bd42e2f0cebb2fe8de77a054e9d30aa803749a61 diff --git a/qtdeclarative b/qtdeclarative index 7c4335d0..9dee5348 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c4335d0307abde6dd17738481d006d70771714c +Subproject commit 9dee534836092787d774be7face029b5cf53e546 diff --git a/qtimageformats b/qtimageformats index 55904e96..7cfe47a8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 55904e9671f4e927308a78d217c0069528ba7f49 +Subproject commit 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c4079ef5..4a92afe7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c4079ef585f3efdedc64d961d8ef2bd90cedb7fc +Subproject commit 4a92afe75bfb7886ecb1b3282b05b2985c39fe3c diff --git a/qtwayland b/qtwayland index 334822b7..53dff95b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 334822b742cb15bb27dbc14b45d41e2714eef767 +Subproject commit 53dff95bfbe9070c4cd17045f3d5147f29710c5f From 2b2a639fb9ffa9f7a66b25503cb87b8abcda896f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Aug 2018 13:33:10 +0200 Subject: [PATCH 19/20] Unify the iOS/tvOS/watchOS builds in default.txt Then we can save more virtual machines. DebugAndRelease V.S. Release(build time): qtbase * iOS static: 14min, 57s : 11min, 35s * tvOS: 17min, 24s : 9min, 38s * watchOS: 16min, 36s : 9min, 46s The longest ones, some win10 builds, are about 40 min. And the longest ones for tests, are about 1 and half hours. qtdeclarative * iOS static: 19min, 10s : 12min, 19s * tvOS: 20min, 35s : 12min, 55s * watchOS: 15min, 17s : 9min, 59s qtwebengine * iOS static: 12min, 48s : 4min, 14s * tvOS: 6min, 6s : 4min, 10s * watchOS: 6min, 21s : 6min, 13s Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 6 +++--- coin/platform_configs/qt5.txt | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index a5dc5d4a..9235d866 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,9 +16,9 @@ qtci-linux-RHEL-7.4-x86_64 GCC qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static -qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests -qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 72ec9b61..fae586d9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,9 +13,6 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 From 5a2a93ddf48465f37c116ef93f66682d789a61fc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Aug 2018 23:30:40 +0200 Subject: [PATCH 20/20] Update submodules on '5.11' in qt5 Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtvirtualkeyboard | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index d0692c69..42a466e0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d0692c6944599a5561ea07faaa6bddf98e7e2a6e +Subproject commit 42a466e0c77e4ef209a51bfa04ee6ca2bcae99a4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4a92afe7..30479f97 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4a92afe75bfb7886ecb1b3282b05b2985c39fe3c +Subproject commit 30479f9771e60938dc0f6e325e3b16fb52663796