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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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/29] 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 d0d326dddd84e7ce3416c243e04e5b764d1655db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 5 Jan 2018 14:33:35 +0200 Subject: [PATCH 18/29] Replace MinGW 5.3.0 with 7.3.0 Task-number: QTQAINFRA-1289 Task-number: QTQAINFRA-1389 Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 12 ++++++------ coin/platform_configs/qtwebkit.txt | 2 +- coin/provisioning/common/windows/open62541.ps1 | 8 ++++++-- .../qtci-windows-7-x86/09-install-mingw530.ps1 | 10 ---------- .../qtci-windows-7-x86/09-install-mingw730.ps1 | 10 ++++++++++ .../provisioning/qtci-windows-7-x86/79-open62541.ps1 | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b4f0bc14..692dd1b0 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic +qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5e0e6657..c188d09b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -3,21 +3,21 @@ Template Target OS Target arch Compiler Features qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 Clang 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 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index efae9754..a357ad5b 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 index 7e87cac4..beb09487 100644 --- a/coin/provisioning/common/windows/open62541.ps1 +++ b/coin/provisioning/common/windows/open62541.ps1 @@ -111,7 +111,7 @@ function MSVCEnvironment function BuildAndInstallOpen62541 { Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, msvc2015, msvc2017]")), + [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), [string]$Platform=$(throw("You must specify the target platform [x86, x64]")), [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]")) ) @@ -165,7 +165,7 @@ function BuildAndInstallOpen62541 function DownloadAndInstall { Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, msvc2015, msvc2017]")), + [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), [string]$Platform=$(throw("You must specify the target platform [x86, x64]")) ) $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/" @@ -233,6 +233,8 @@ if ($targetCommand.StartsWith("mingw")) { PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530 Write-Host "### Invoking MinGW630 build" PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630 + Write-Host "### Invoking MinGW730 build" + PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730 Write-Host "### Invoking MSVC2015 build" PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86 PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64 @@ -246,6 +248,8 @@ if ($targetCommand.StartsWith("mingw")) { DownloadAndInstall mingw530 x86 Write-Host "### MinGW630 x64" DownloadAndInstall mingw630 x86 + Write-Host "### MinGW730 x64" + DownloadAndInstall mingw730 x64 Write-Host "### MSVC2015 x86" DownloadAndInstall msvc2015 x86 Write-Host "### MSVC2015 x64" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 deleted file mode 100644 index 684816f0..00000000 --- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-mingw.ps1" - -# This script will install MinGW 5.3.0 - -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" - -InstallMinGW $release $sha1 - - diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 new file mode 100644 index 00000000..c893926e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 7.3.0 + +$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0" +$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532" + +InstallMinGW $release $sha1 + + diff --git a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 b/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 index a7bc8cd4..85bfb98c 100644 --- a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 @@ -1,2 +1,2 @@ . "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare -. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw530 +. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730 From 5f57766742dfcc0adeec95f03daf54361b25956e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Aug 2018 21:36:16 +0200 Subject: [PATCH 19/29] Update submodules on '5.12' in qt5 Exclude qtdeclarative in this round. Change-Id: I1a4a5cbf3817b40e47701fdc5a0f6f4df18633c9 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 4bbc782f..37edb446 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4bbc782fc70f30e8b1530e87c85a8f453deb051d +Subproject commit 37edb4464e5f05d239cff4e53c5552fc851960a1 diff --git a/qtbase b/qtbase index ed557c03..231273b1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ed557c037847e343caa010562952b398f806adcd +Subproject commit 231273b130d4cc213158ce858262b7f1b7b6fcdd diff --git a/qtcanvas3d b/qtcanvas3d index d5565b5c..fb5394ce 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit d5565b5cee35570e185b34ca143158f79a27a3a5 +Subproject commit fb5394ce6d38d06c13b01574cf00d4fe98025c52 diff --git a/qtcharts b/qtcharts index cfde71c2..79888d87 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cfde71c26792d595c2d948627b6c19ce0d7e9054 +Subproject commit 79888d87ad08ec120fc170c7d450c5ac1067ce89 diff --git a/qtconnectivity b/qtconnectivity index 4a20dda2..fcf1f30d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4a20dda27259fad1468370860162b8f22ca53072 +Subproject commit fcf1f30d5fc541a15f0dd4df40a1869630aa3478 diff --git a/qtlocation b/qtlocation index 34ee7672..a011969f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 34ee76720ee09ac692ea149ce44413cb5c0c7b99 +Subproject commit a011969f842d662b593e6b33c09dedd90c82de9c diff --git a/qtremoteobjects b/qtremoteobjects index 20584755..2be71ac8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 20584755d916e55fecaf2292dc92d47899e7df9e +Subproject commit 2be71ac8a46effa8cf39a8f034fbd7a36d6d6d27 diff --git a/qttools b/qttools index babc227f..78df61b5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit babc227fa25733c1562eccd9623fd8a5f6bec688 +Subproject commit 78df61b51b9bf52364681ccedc82c8eb6aba5469 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 726832a0..9513bd4b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 726832a05c4400159d524b6f508cd25bf66da305 +Subproject commit 9513bd4b5fc2adc1d7d3ab070040543b989d9ed3 diff --git a/qtwayland b/qtwayland index 51768025..de4f9ebe 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 51768025a100232743290fa07fc5c46821c16556 +Subproject commit de4f9ebea3207e5d7e87390b512f9ae8bb7636cc diff --git a/qtwebengine b/qtwebengine index 42a1f19e..c4cded3f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 42a1f19e3d06b8b23ab13c7479b754a05bee2b5e +Subproject commit c4cded3fd5ba64b2544a6f0c5307c661c55fddb3 From 02336a3ac05186215aef54f80c458dc064e754d6 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Aug 2018 11:46:50 +0200 Subject: [PATCH 20/29] Provisioning: need to install packages in Xcode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-70180 Change-Id: I23134b887bf7fa05e29bd16769fdb9c7f025764e Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/macos/install_xcode.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh index 44f0a648..5fcf26a0 100755 --- a/coin/provisioning/common/macos/install_xcode.sh +++ b/coin/provisioning/common/macos/install_xcode.sh @@ -58,6 +58,10 @@ function InstallXCode() { echo "Accept license" sudo xcodebuild -license accept + echo "Install packages" + # -runFirstLaunch is valid in 9.x + sudo xcodebuild -runFirstLaunch || true + echo "Enabling developer mode, so that using lldb does not require interactive password entry" sudo /usr/sbin/DevToolsSecurity -enable From e999cc7df90681556622876baa90b6ec2fb76191 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Aug 2018 09:16:50 +0200 Subject: [PATCH 21/29] Move iOS/tvOS/watchOS build host to macOS 10.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-70180 Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838 Reviewed-by: Tor Arne Vestbø Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 6 +++--- coin/platform_configs/qt5.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 692dd1b0..e856c4f1 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,9 +16,9 @@ qtci-macos-10.12-x86_64-8 Clang qtci-macos-10.13-x86_64 Clang DebugAndRelease Release DisableTests qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch qtci-macos-10.12-x86_64-8 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.13-x86_64 IOS_ANY multi Clang Release DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang Release DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang 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 c188d09b..980b1323 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,9 +13,9 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 Clang 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-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 From 3044d0d4547e1b1c7f77c384e652ce3fbaacb1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 28 Aug 2018 15:11:03 +0200 Subject: [PATCH 22/29] Enable autotests on macOS 10.13 Task-number: QTQAINFRA-1301 Change-Id: I65680f2a0fd42b7473da05f71a8f1cb3d733a360 Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e856c4f1..f1297973 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -13,7 +13,7 @@ qtci-linux-openSUSE-42.3-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release -qtci-macos-10.13-x86_64 Clang DebugAndRelease Release DisableTests +qtci-macos-10.13-x86_64 Clang DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests qtci-macos-10.13-x86_64 IOS_ANY multi Clang Release DisableTests Static 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 23/29] 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 24/29] 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 cf405ea20ee84afb097a9ae4d1c072ec151e1471 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 Aug 2018 07:49:24 +0200 Subject: [PATCH 25/29] Update submodules on '5.12' in qt5 Exclude qtdeclarative in this round. Change-Id: Iad9c2862709be91155a9a72af77fb769528768cc Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index e92e3d36..e6f312aa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e92e3d36c2fdafeb713bc42164eb6dbad46e2d5b +Subproject commit e6f312aab5cdf8bc9c9c2e55931757d6d29c72cc diff --git a/qtbase b/qtbase index 231273b1..546eb7b9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 231273b130d4cc213158ce858262b7f1b7b6fcdd +Subproject commit 546eb7b9473ee78a9ec4167a4f710eb7998f53eb diff --git a/qtconnectivity b/qtconnectivity index fcf1f30d..77c3c142 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fcf1f30d5fc541a15f0dd4df40a1869630aa3478 +Subproject commit 77c3c1427d240c9d17534583218b850f73352b12 diff --git a/qtremoteobjects b/qtremoteobjects index 2be71ac8..854217d6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2be71ac8a46effa8cf39a8f034fbd7a36d6d6d27 +Subproject commit 854217d60da9ab54795fb39896a053f301222848 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9513bd4b..b253a3f1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9513bd4b5fc2adc1d7d3ab070040543b989d9ed3 +Subproject commit b253a3f14af12588966687d66cfa8829e3b1758f diff --git a/qtwayland b/qtwayland index de4f9ebe..aa341afd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit de4f9ebea3207e5d7e87390b512f9ae8bb7636cc +Subproject commit aa341afd9b428f5ad2d0bc1c16d9cda64a4b04fb diff --git a/qtwebengine b/qtwebengine index c4cded3f..1a3135eb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c4cded3fd5ba64b2544a6f0c5307c661c55fddb3 +Subproject commit 1a3135eb5ddef1fa93e72c3e867de0be08a1bd4c diff --git a/qtxmlpatterns b/qtxmlpatterns index b9b94194..8c6e2432 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b9b941945dc63a48652576c806e10dfeb15005e9 +Subproject commit 8c6e24329ecd65f364654b1ca2b6a273f0826a8b From e470da9d650c1e58c866807e3ae93197e1517756 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 16 Jun 2018 14:51:57 +0200 Subject: [PATCH 26/29] Make xmlpatterns depend on declarative After moving the xmllistmodel into qtxmlpatterns we can reverse the dependency. This will improve build times and cleaning up dependencies makes sense in any case. Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79 Reviewed-by: Simon Hausmann --- .gitmodules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 72b451de..eeba9f34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtsvg qtxmlpatterns + recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git branch = 5.12 @@ -45,6 +45,7 @@ status = essential [submodule "qtxmlpatterns"] depends = qtbase + recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.12 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 27/29] 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 From e89420945f368ec7b6d03b8aeb6e6b478ee960fe Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 7 Feb 2018 16:03:26 +0200 Subject: [PATCH 28/29] Add Ubuntu 18.04 to the CI Qt 5.12 will have both 16.04 and 18.04 LTS releases verified. Some configurations are upgraded from 16.04 to 18.04. Task-number: QTQAINFRA-1983 Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 11 +- coin/platform_configs/qtbase.txt | 4 +- coin/platform_configs/qtdeclarative.txt | 4 +- .../common/linux/apt_wait_loop.sh | 44 +++++ .../01-systemsetup.sh | 70 ++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 152 ++++++++++++++++++ .../02-disable-ntp.sh | 4 + .../03-qemu.sh | 4 +- .../04-libclang.sh | 4 + .../04-yocto.sh | 0 .../10-openssl_for_android_linux.sh | 0 .../qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh | 6 + .../40-android_linux.sh | 39 +++++ .../40-cmake.sh | 5 + .../90-squish.sh | 4 + 15 files changed, 341 insertions(+), 10 deletions(-) create mode 100755 coin/provisioning/common/linux/apt_wait_loop.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86_64 => qtci-linux-Ubuntu-18.04-x86_64}/03-qemu.sh (98%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86_64 => qtci-linux-Ubuntu-18.04-x86_64}/04-yocto.sh (100%) rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86_64 => qtci-linux-Ubuntu-18.04-x86_64}/10-openssl_for_android_linux.sh (100%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index f1297973..7ac4037a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,8 +7,9 @@ qtci-windows-10-x86_64-10 MSVC2015 qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation +qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples +qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo @@ -20,8 +21,8 @@ qtci-macos-10.13-x86_64 IOS_ANY multi Clang qtci-macos-10.13-x86_64 TvOS_ANY multi Clang Release DisableTests qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang 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 -qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 0c619ed1..4a2c720c 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 9d321d40..e2b69559 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/provisioning/common/linux/apt_wait_loop.sh b/coin/provisioning/common/linux/apt_wait_loop.sh new file mode 100755 index 00000000..b34e1ebc --- /dev/null +++ b/coin/provisioning/common/linux/apt_wait_loop.sh @@ -0,0 +1,44 @@ +#!/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$ +## +############################################################################# + +set -ex + +function waitLoop { + +while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do + echo "Waiting for other software managers to finish..." + sleep 0.5 +done +} diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..96bf23f8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env 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 modifies system settings for automated use + +set -ex + +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +NTS_IP=10.212.2.216 + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub + +# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320 +echo "Setting up workaround for Ubuntu systemd resolve bug" +sudo rm -f /etc/resolv.conf +sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf + +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 + +echo 'LC_ALL=en_US.UTF8' | sudo tee /etc/default/locale + +if [ "$http_proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf +fi + +# This script diverts qtlogging.ini file so we don't get debugging related auto-test failures. +sudo dpkg-divert --divert /etc/xdg/QtProject/qtlogging.ini.foo --rename /etc/xdg/QtProject/qtlogging.ini diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh new file mode 100755 index 00000000..ff2f1dac --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -0,0 +1,152 @@ +#!/usr/bin/env 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$ +## +############################################################################# + +# Install required packages with APT + +# shellcheck source=../common/linux/apt_wait_loop.sh +source "${BASH_SOURCE%/*}/../common/linux/apt_wait_loop.sh" + +echo "Disabling auto update" +sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic +for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service +done +# Git is not needed by builds themselves, but is nice to have +# immediately as one starts debugging +installPackages+=(git) +# 7zip is a needed decompressing tool +installPackages+=(p7zip-full) +# To be able to mount yocto-cache during builds +installPackages+=(nfs-common) +# libssl-dev provides headers for OpenSSL +installPackages+=(libssl-dev) +# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git +installPackages+=("^libxcb.*") +installPackages+=(libxkbcommon-dev) +installPackages+=(libxkbcommon-x11-dev) +installPackages+=(libx11-xcb-dev) +installPackages+=(libglu1-mesa-dev) +installPackages+=(libxrender-dev) +installPackages+=(libxi-dev) +# Enable linking to system dbus +installPackages+=(libdbus-1-dev) +# Needed libraries for WebEngine +installPackages+=(libudev-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +# Common event loop handling +installPackages+=(libglib2.0-dev) +# MySQL support +installPackages+=(libmysqlclient-dev) +# PostgreSQL support +installPackages+=(libpq-dev) +# SQLite support +installPackages+=(libsqlite3-dev) +# ODBC support +installPackages+=(unixodbc-dev) +# Support for FreeType font engine +installPackages+=(libfreetype6-dev) +# Enable the usage of system jpeg libraries +installPackages+=(libjpeg-dev) +# Enable support for printer driver +installPackages+=(libcups2-dev) +# Install libraries needed for QtMultimedia to be able to support all plugins +installPackages+=(libasound2-dev) +installPackages+=(libgstreamer1.0-dev) +installPackages+=(libgstreamer-plugins-base1.0-dev) +installPackages+=(libgstreamer-plugins-good1.0-dev) +installPackages+=(libgstreamer-plugins-bad1.0-dev) +# Support for cross-building to x86 (needed by WebEngine boot2qt builds) +installPackages+=(g++-multilib) +# python3 development package +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(python3-virtualenv) +# python2 development package +installPackages+=(python-dev) +# Automates interactive applications (Needed by RTA to automate configure testing) +installPackages+=(expect) +installPackages+=(mesa-common-dev) +installPackages+=(libgl1-mesa-glx) +installPackages+=(libgl1-mesa-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(curl) +installPackages+=(libicu-dev) +installPackages+=(zlib1g-dev) +installPackages+=(zlib1g) +installPackages+=(openjdk-8-jdk) +installPackages+=(libgtk-3-dev) +installPackages+=(ninja-build) +installPackages+=(libssl-dev) +installPackages+=(libxcursor-dev) +installPackages+=(libxcomposite-dev) +installPackages+=(libxdamage-dev) +installPackages+=(libxrandr-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +installPackages+=(libsrtp0-dev) +installPackages+=(libwebp-dev) +installPackages+=(libjsoncpp-dev) +installPackages+=(libopus-dev) +installPackages+=(libminizip-dev) +installPackages+=(libavutil-dev) +installPackages+=(libavformat-dev) +installPackages+=(libavcodec-dev) +installPackages+=(libevent-dev) +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(libasound2-dev) +installPackages+=(libpulse-dev) +installPackages+=(libxtst-dev) +installPackages+=(libnspr4-dev) +installPackages+=(libnss3-dev) +installPackages+=(libnss3) +installPackages+=(libopenal-dev) +installPackages+=(libbluetooth-dev) +#VirtualBox for RTA +installPackages+=(virtualbox) +installPackages+=(dkms) +# Needed for qtspeech +installPackages+=(libspeechd-dev) + +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" +echo "Running update for apt" +waitLoop +sudo apt-get update diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..89806892 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh similarity index 98% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh rename to coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index edabeb0c..e3faa20e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -45,6 +45,8 @@ cd "$tempDir" #latest commit from the master proven to work git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f +git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 +git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7 git submodule update --init pixman patch -p1 < Date: Thu, 30 Aug 2018 22:33:49 +0200 Subject: [PATCH 29/29] Update submodules on '5.12' in qt5 Exclude qtdeclarative in this round. Change-Id: I74de8fc02d0c0295dc7746defe11bed50fb0ba5e Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index e6f312aa..61ba7f75 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e6f312aab5cdf8bc9c9c2e55931757d6d29c72cc +Subproject commit 61ba7f75931bddcfdc411eeb518478397e0f309a diff --git a/qtandroidextras b/qtandroidextras index 6711472d..e72bba43 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 6711472d14d8f675160d559978acee96c1fb25c6 +Subproject commit e72bba4352a2c366887483a4d9ee5afd97589c0b diff --git a/qtbase b/qtbase index 546eb7b9..29c0377f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 546eb7b9473ee78a9ec4167a4f710eb7998f53eb +Subproject commit 29c0377f07f4942f9957ea87d59c252148dc9e5b diff --git a/qtconnectivity b/qtconnectivity index 77c3c142..9004e89b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 77c3c1427d240c9d17534583218b850f73352b12 +Subproject commit 9004e89bb902a709c3d61c7f168d2d39fe2cd936 diff --git a/qtlocation b/qtlocation index a011969f..ffd680a1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a011969f842d662b593e6b33c09dedd90c82de9c +Subproject commit ffd680a132db99f1fa1e9ebb75c844c491afa83b diff --git a/qtmultimedia b/qtmultimedia index ec597d89..35ace9e2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ec597d89320dd312382457a711ebddb085b16a59 +Subproject commit 35ace9e289dcaada5e0828a59ca7dfee78a6342c diff --git a/qtsensors b/qtsensors index 44c357ce..12bb2552 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 44c357ce531b06d7050ac9987c1ee8c1c470bd75 +Subproject commit 12bb2552599111aa2f7b6dc69bd0dd565edba710 diff --git a/qttools b/qttools index 78df61b5..72c8cc1b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 78df61b51b9bf52364681ccedc82c8eb6aba5469 +Subproject commit 72c8cc1b4dd0cc77d074a4cee1d698b8fb69e503 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b253a3f1..c11c0886 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b253a3f14af12588966687d66cfa8829e3b1758f +Subproject commit c11c0886266cffa34210ca287a6a99ec1633d56b diff --git a/qtwayland b/qtwayland index aa341afd..bc7e69b1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit aa341afd9b428f5ad2d0bc1c16d9cda64a4b04fb +Subproject commit bc7e69b176816536bbd0a0ca3c4fd83b1ba160cd diff --git a/qtwebchannel b/qtwebchannel index 0880c04e..e6c5b444 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0880c04eec2653b94ac58f0e20a2215243fd1c66 +Subproject commit e6c5b44453635be0f05f3ee9545e3cb348e1b1a9 diff --git a/qtwebengine b/qtwebengine index 1a3135eb..874ca966 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1a3135eb5ddef1fa93e72c3e867de0be08a1bd4c +Subproject commit 874ca9668bae643445b282a1681f15dc67008d29