From 816f1c5512d3cb98a76ee63add48ae5202f45061 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Jun 2017 09:38:44 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I6c6a2f3d51f4899809810123112081a47f054358 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttranslations | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 1131db8b..79b4a695 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1131db8b4708dfa222b50fb4981a7becaf5ae4a3 +Subproject commit 79b4a69586966707e9fddac038322f121f1e7167 diff --git a/qtdoc b/qtdoc index 7672f924..f37d256d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7672f92440e7ba5587583acf8f54128a203f9acc +Subproject commit f37d256dc7103cc00b2224075c4bad9ea532edb8 diff --git a/qtlocation b/qtlocation index d2b7d77b..0a389325 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d2b7d77b7d882e00a2c1bb938a04493e4b1b6d44 +Subproject commit 0a38932510ffaad5387b7e86c7ca70aed8af5c5b diff --git a/qtqa b/qtqa index e8b0477c..a8269470 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e8b0477c14f74f9e3098d7ba6300ecbce912efef +Subproject commit a8269470a9e21f3e685f25c09e3a92f0ac6615d5 diff --git a/qtrepotools b/qtrepotools index 59e404b2..b5357f68 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3 +Subproject commit b5357f68bce6b1f3554745c03295fcc6c47a7e5f diff --git a/qttranslations b/qttranslations index e0ee24ef..df316bf7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e0ee24efee5472d353accb70fa86274bc34a34db +Subproject commit df316bf7e6508ae1360247feb08780a77ea4210e -- cgit v1.2.3 From 2c4b06a13d863827d62a537fa4f732c74600a1bd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Jun 2017 16:27:53 +0200 Subject: Centralize Mesa LLVMPipe installation on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install the DLL for general availability on all Windows systems. Due to its distinct name it will not be picked up by anyone unless Qt explicitly selects it. This gives us the ability to choose the GLES backend to use in Qt. Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/mesa_llvmpipe.ps1 | 63 ++++++++++++++++++++++ .../qtci-windows-10-x86/06-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-10-x86_64/opengl32_x86.ps1 | 11 ---- .../qtci-windows-7-x86/08-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8-x86/07-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 | 1 + 7 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 coin/provisioning/common/mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 new file mode 100644 index 00000000..7ea0629d --- /dev/null +++ b/coin/provisioning/common/mesa_llvmpipe.ps1 @@ -0,0 +1,63 @@ +############################################################################# +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +$version = "11_2_2" +$package = "C:\Windows\temp\opengl32sw.7z" +$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" +$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" +$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" +$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" + +function Extract-Mesa +{ + Param ( + [string]$downloadUrl, + [string]$sha1, + [string]$targetFolder + ) + Write-Host "Installing Mesa from $downloadUrl to $targetFolder" + $localArchivePath = "C:\Windows\temp\opengl32sw.7z" + Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $localArchivePath + Verify-Checksum $localArchivePath $sha1 + Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$targetFolder"} + Remove-Item $localArchivePath +} + +if ( Test-Path C:\Windows\SysWOW64 ) { + Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative" + Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" +} else { + Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" +} + diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index fa2c753a..bd9afd5a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -34,22 +34,11 @@ . "$PSScriptRoot\..\common\helpers.ps1" $version = "11_2_2" -$package = "C:\Windows\temp\opengl32sw_$version.7z" -$destinationFolder = "C:\Windows\SysWOW64" $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" -$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" $openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" -Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package -Verify-Checksum $package $mesaOpenglSha1 -Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} - -echo "Remove downloaded $package ..." -Remove-Item $package -recurse - echo "Take ownership of existing opengl32.dll from SysWOW64" takeown /f $openglPackage icacls $openglPackage /grant Administrators:F diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" -- cgit v1.2.3 From fd58c39c311e5428eef3eeccd4d515cc26232921 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Jun 2017 23:53:16 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdoc | 2 +- qtrepotools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 2fbd30b1..ddf9740b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2fbd30b1de6abcb7b660083dde120c8b03a3abbc +Subproject commit ddf9740b3df51078d879b9b577d0a722b4da57a4 diff --git a/qtbase b/qtbase index 79b4a695..5c13acd3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 79b4a69586966707e9fddac038322f121f1e7167 +Subproject commit 5c13acd3c953dd9f8fd9b17d7a1be7c3f5e4004f diff --git a/qtdoc b/qtdoc index f37d256d..2646d39b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f37d256dc7103cc00b2224075c4bad9ea532edb8 +Subproject commit 2646d39b11242088771aab9c0370a75ce8e13e8f diff --git a/qtrepotools b/qtrepotools index b5357f68..c8035e6a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit b5357f68bce6b1f3554745c03295fcc6c47a7e5f +Subproject commit c8035e6afde9e92f968e690aee3365a887b110c7 -- cgit v1.2.3 From 252cbbc4b8988b3039ecc41ffa9bc75865b94751 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 29 Jun 2017 13:58:43 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtrepotools | 2 +- qtwebchannel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 5c13acd3..5c99fe2b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c13acd3c953dd9f8fd9b17d7a1be7c3f5e4004f +Subproject commit 5c99fe2bacf7be54d6b649f5d798c185f7c78990 diff --git a/qtrepotools b/qtrepotools index c8035e6a..8980e505 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c8035e6afde9e92f968e690aee3365a887b110c7 +Subproject commit 8980e505b5cdc8b6b9beb397887dc743dfc845c4 diff --git a/qtwebchannel b/qtwebchannel index 18a53cef..64306392 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 18a53cef73eed59cddd7962d4e4aa8fbf7d3170a +Subproject commit 64306392ce3a7751bfb58e1352b212ad5cba8aec -- cgit v1.2.3 From 2176de22868f2fd814e6ed00b394c7ad2700f011 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Jul 2017 13:25:57 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 5c99fe2b..24260d50 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c99fe2bacf7be54d6b649f5d798c185f7c78990 +Subproject commit 24260d5030be0f76899c84d95670147526a0eda8 -- cgit v1.2.3 From 7e67de9700d81070290ab4cd82f1440c3e885efe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Jul 2017 17:32:39 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 24260d50..12823a0c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 24260d5030be0f76899c84d95670147526a0eda8 +Subproject commit 12823a0cc0d1629fc0abe96c0dde4b1b92e76046 diff --git a/qtqa b/qtqa index a8269470..e16c6bc1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a8269470a9e21f3e685f25c09e3a92f0ac6615d5 +Subproject commit e16c6bc1ec90a8603c3fb29797a1f73799456b40 -- cgit v1.2.3 From 70c5a5bb97a69e9a211bf3cb1c5d63046f3b6cb7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Jul 2017 11:37:37 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index b891cf66..cadfd44c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b891cf66a3d29b0b5245f07e40428b8778ebc051 +Subproject commit cadfd44c77de9ad3d66e936df140e4ba6efb0d74 diff --git a/qtbase b/qtbase index 7beb2bc0..16799ba3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7beb2bc02bff9fa591eb60b978ed97d0601bedfd +Subproject commit 16799ba394e0684cee8ca921432e418e1e0f6c63 diff --git a/qtdeclarative b/qtdeclarative index f6cc21f0..b9767f03 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f6cc21f08441f1aa6fa0c4acd9e41efedb4e3823 +Subproject commit b9767f03bdfcc06dae49661150fbeb0f19a8547b diff --git a/qtlocation b/qtlocation index a6be180f..d4cb4961 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a6be180f8f4defd9f6341f4ca089d3e22df431e6 +Subproject commit d4cb4961ed0a15d0746d96da38228787658d87bd diff --git a/qtmultimedia b/qtmultimedia index 2b343aff..eed32d94 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2b343affb7b16ff195bbc8139d2873b183292852 +Subproject commit eed32d94de9faca7380f7497e7ab0d119ef3cf5c diff --git a/qtnetworkauth b/qtnetworkauth index 6e4706d2..11b711bc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 6e4706d2f6e756a8e077e53bd065449382973e04 +Subproject commit 11b711bc97b66b5976d24f9411fe76a2f858eab9 diff --git a/qtqa b/qtqa index 3e8228ee..f2fea571 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3e8228ee7410c88ca20cc86e0a4120ceed14a9e8 +Subproject commit f2fea571b9e17dc31eff349f6b744603c670dcd6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 57810c5c..8bc2feb4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 57810c5c736f69790dd49fa1146eb70de8c95a55 +Subproject commit 8bc2feb498cbbeafe0de52cda929ef7a881c0351 diff --git a/qttools b/qttools index 6bbf0647..b2a1066e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6bbf06477f6508b84b4fdf2a885ac880013f1892 +Subproject commit b2a1066e108678aa66d7e6f22cadf9c01d646ec9 diff --git a/qtwebengine b/qtwebengine index c5a65f03..630f7b24 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c5a65f036204e4f5d951eedc20ce2c7ddf782a70 +Subproject commit 630f7b24f67646b05a2222761b192316123d8931 -- cgit v1.2.3 From f8d8257579d68a7d80c2fb32e43da7288b105afb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Jul 2017 11:34:00 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I113ebb2db59a55786929361437a17536a0131676 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 16799ba3..70b976ec 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 16799ba394e0684cee8ca921432e418e1e0f6c63 +Subproject commit 70b976ece1ad36b1e59d2b67f6cda8ff6b86017c diff --git a/qtdoc b/qtdoc index 4be490c8..df47da65 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4be490c82dbbb4fb1b60c7e34ddaf18b259b4678 +Subproject commit df47da6534e40ca28c8067ac41fc6323bc59a500 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8bc2feb4..cc188f89 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8bc2feb498cbbeafe0de52cda929ef7a881c0351 +Subproject commit cc188f897af27daf47b0937e38ccb76ac2310abb diff --git a/qtwayland b/qtwayland index ac8fa523..6f3d6926 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ac8fa523dde02f6fa760472c75edf9709bd7bb2a +Subproject commit 6f3d69264b6640c94ecfdb89c4bbf90319534b09 -- cgit v1.2.3 From 1bdbe06c82051abbe7028c5f2babe586c94eb302 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 3 Jul 2017 15:16:38 +0200 Subject: MSVC: Run tests with MSVC2017 instead of MSVC2013 It appears tests compiled with MSVC2013/64bit are prone to crashes. Keep only a developer build/compile test in default.txt and move the packacking builds to qt5.txt with tests disabled. Enable testing with MSVC2017 builds in qt5.txt. Task-number: QTBUG-58654 Task-number: QTBUG-50835 Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +--- coin/platform_configs/qt5.txt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d2328871..c82a0feb 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,9 +1,7 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index efcdd620..fec2a44c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,10 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -- cgit v1.2.3 From 88cb7f426442b11f25045cd621bc0999e20a391a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Jul 2017 23:59:47 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43 Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 12823a0c..e90d083f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12823a0cc0d1629fc0abe96c0dde4b1b92e76046 +Subproject commit e90d083fa87e7c94b2391f894b1466976688916f diff --git a/qtqa b/qtqa index e16c6bc1..f2fea571 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e16c6bc1ec90a8603c3fb29797a1f73799456b40 +Subproject commit f2fea571b9e17dc31eff349f6b744603c670dcd6 diff --git a/qtwebengine b/qtwebengine index 56f594b1..e4ae85ee 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56f594b1f1750c7bb9917d5e1122233401ff00a2 +Subproject commit e4ae85ee05d1eca3f58e34d3d0f594c01216e163 -- cgit v1.2.3 From 8b9a8c489f8670a3be7cf30d2cfc224fb95c1144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jul 2017 16:04:19 +0200 Subject: Use updated Ubuntu 16.04 in CI The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 8 ++++---- coin/platform_configs/qtdeclarative.txt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c82a0feb..7ee4df05 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,8 +7,8 @@ qtci-windows-10-x86_64-7 x86 MSVC2015 qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro armv7 GCC Release -qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c7552671..c8ac9c47 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features -------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild -- cgit v1.2.3 From eca392d3f3831f07c96a24f08feb0f292b9dd62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jul 2017 16:00:50 +0200 Subject: Use updated Ubuntu 14.04 in CI The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 2e11cc02..3da4c983 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,8 +10,8 @@ qtci-windows-10-x86-6 MSVC2015 qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release @@ -20,7 +20,7 @@ qtci-osx-10.9-x86_64 Clang qtci-osx-10.8-x86_64 Clang Release NoFramework qtci-osx-10.11-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Fido armv7 GCC DisableTests +qtci-linux-Ubuntu-14.04-x86_64-1 Boot2Qt_Fido armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-14.04-x86_64-1 GCC TestOnly LicenseCheck qtci-windows-7-x86-2 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 -- cgit v1.2.3 From c9d5341307e02cc71d4d99342e6915621f7d18f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 17 Jul 2017 11:10:53 +0300 Subject: Provisioning: Fix virtualenv in macOS 10.11 There are multiple Python installations in our macOS 10.11 Tier1 template. Most of them are pretty old and not even working properly. One of the affected Python tool is virtualenv, which atm is creating Python 2.6 env by default even if Python 2.7 is the default Python. Change-Id: I8bc0900976a9dc79637539802345175c85b7b433 Reviewed-by: Simon Hausmann --- .../qtci-osx-10.11-x86_64/004-fix-virtualenv.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh new file mode 100755 index 00000000..f3646572 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# macOS 10.11 template doesn't have working virtualenv installation. +# To fix that, we first have to install pip to install virtualenv +# Install pip +curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py +sudo python get-pip.py +rm get-pip.py + +# remove link pointing to broken virtualenv +sudo rm /opt/local/bin/virtualenv +sudo pip install virtualenv + +# fix the link. This is optional, while the new installation is +# already in PATH, but there will be virtualenv-2.6 in /opt/local/bin +# which might be confusing +sudo ln -s /usr/local/bin/virtualenv /opt/local/bin/virtualenv -- cgit v1.2.3