From 8b46f403c840afbdeea6b68c3fb2bfeb3737bf97 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 14 Aug 2018 13:00:09 +0200 Subject: [PATCH 01/11] Adjust submodule branches Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3449e50c..72b451de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,59 +1,59 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.12 status = essential priority = 30 [submodule "qtdoc"] @@ -61,7 +61,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.12 status = essential priority = 40 [submodule "qtrepotools"] @@ -82,14 +82,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -122,185 +122,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.12 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 5.12 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = 5.12 status = preview From c00f007d3253198aa1c70fea3992fdf20228e37a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 15 Aug 2018 10:16:08 +0200 Subject: [PATCH 02/11] Update submodules on '5.12' in qt5 Exclude qtbase in this round. Change-Id: I0b4c1359b5f5016a1732a290d8e0affa50182e69 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 0f813d7f..e75a541d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0f813d7f28bacdd71ba2540946a801cf44e40a73 +Subproject commit e75a541dbb27119c31ffd6dd36c38cd8a81f2431 diff --git a/qtconnectivity b/qtconnectivity index b6edd379..7d3ee483 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6edd379204221bf9848b3648106e56c7c2cd7e6 +Subproject commit 7d3ee483c5fc348f43d93c0be0909e769dc51606 diff --git a/qtdeclarative b/qtdeclarative index 32f93f08..a29ab499 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 32f93f087dac5ed73ca1c19dbee4059e026bc3da +Subproject commit a29ab499a4822014d34d6e9e988600fdb6d60a0d 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 6f781fd2..8761c1a2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6f781fd266caa1e268e167f7273fec3e30d5af7a +Subproject commit 8761c1a282f596a64e0fc624c87added43fb47d8 diff --git a/qtsvg b/qtsvg index 524478f6..bb80aeee 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 524478f60e6eac991b9ef033a2030a9ea5aa5c36 +Subproject commit bb80aeee1fb19445889210ec913046d0ca385721 diff --git a/qtwayland b/qtwayland index 61734175..88851b6d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 617341751630be295f9e3dc0a9ea630de61ee345 +Subproject commit 88851b6de433ab25047166bf4708e99e111b7af2 diff --git a/qtwebengine b/qtwebengine index 80f42a09..0358558a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 80f42a0955365d641d7ca6cb5e99d0a8252a543e +Subproject commit 0358558a3a22c0fdb586de95e4c48bced96ff6c5 From f8086955b3f6f80cb7a1cb2a1fb1a7907a928183 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 13 Aug 2018 10:18:59 +0200 Subject: [PATCH 03/11] Provisioning: Install debug version of vclibs for UWP usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA relies on the availability of debug vclibs. The frameworks are usually installed on first usage by Visual Studio, but as we use winrtrunner, we have to install the packages manually. Task-number: QTBUG-69809 Change-Id: I66cc4b04062afe634345cddc8ab4d001778274cc Reviewed-by: Tony Sarajärvi --- .../provisioning/common/windows/vclibs_debug.ps1 | 16 ++++++++++++++++ .../qtci-windows-10-x86/90-vclibs_debug.ps1 | 3 +++ .../qtci-windows-10-x86_64/90-vclibs_debug.ps1 | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 coin/provisioning/common/windows/vclibs_debug.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 diff --git a/coin/provisioning/common/windows/vclibs_debug.ps1 b/coin/provisioning/common/windows/vclibs_debug.ps1 new file mode 100644 index 00000000..e9020694 --- /dev/null +++ b/coin/provisioning/common/windows/vclibs_debug.ps1 @@ -0,0 +1,16 @@ +function Install-VCLibsDebug +{ + Param ( + [string]$Arch + ) + + $installedPackage = Get-AppxPackage Microsoft.VCLibs.140.00.Debug | Where-Object {$_.Architecture -eq $Arch} + if ($installedPackage) { + Write-Host "Debug VCLibs already installed for $Arch." + return + } + + Add-AppxPackage "C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx" + + Write-Host "Debug VCLibs successfully installed for $Arch." +} diff --git a/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 b/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 new file mode 100644 index 00000000..56ecb97b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 @@ -0,0 +1,3 @@ +. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1" + +Install-VCLibsDebug X86 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 new file mode 100644 index 00000000..49148017 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 @@ -0,0 +1,3 @@ +. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1" + +Install-VCLibsDebug X64 From 6b6f337925a2c729bc5728c1dae456c8553824aa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Aug 2018 09:29:25 +0200 Subject: [PATCH 04/11] Update submodules on '5.12' in qt5 Change-Id: Ie06d6075cf0f157f892e829dabdf5890a646b4ce Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt3d b/qt3d index db836a41..e92e3d36 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit db836a410555108adff3bd594cf75f4174069f0c +Subproject commit e92e3d36c2fdafeb713bc42164eb6dbad46e2d5b diff --git a/qtactiveqt b/qtactiveqt index e75a541d..4bbc782f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e75a541dbb27119c31ffd6dd36c38cd8a81f2431 +Subproject commit 4bbc782fc70f30e8b1530e87c85a8f453deb051d diff --git a/qtbase b/qtbase index ee2e3849..5a03b75c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ee2e38490d51667e878ed1732df387a6d9f2a5fe +Subproject commit 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 diff --git a/qtconnectivity b/qtconnectivity index 7d3ee483..322eb120 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7d3ee483c5fc348f43d93c0be0909e769dc51606 +Subproject commit 322eb120c9237a390ef4d1e29605222498729803 diff --git a/qtdeclarative b/qtdeclarative index a29ab499..e3308076 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a29ab499a4822014d34d6e9e988600fdb6d60a0d +Subproject commit e33080767e73c1fe9156a5423ff4a7c3e00e8470 diff --git a/qtdoc b/qtdoc index fc581c25..bf8e5b17 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fc581c25729d97693d0409420745095773436806 +Subproject commit bf8e5b17c12919005504432f37dc965c49c33159 diff --git a/qtlocation b/qtlocation index 07be65e9..480b5e16 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07be65e9d9a883aab4e1fda367cf591b7cb97631 +Subproject commit 480b5e168da11dc917dfd7ed8d44359d702eac83 diff --git a/qtmultimedia b/qtmultimedia index 6dda96f4..ec597d89 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6dda96f4d4681f7107931bea4c5a0f3fc35bec8d +Subproject commit ec597d89320dd312382457a711ebddb085b16a59 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 628df388..6272ba6c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 628df3881fbb3d3bd1ee4316b47df5871c6dad73 +Subproject commit 6272ba6ced2d6dc5fdd651fce9e958ac7215ccd0 diff --git a/qtremoteobjects b/qtremoteobjects index 8761c1a2..e170cbe4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8761c1a282f596a64e0fc624c87added43fb47d8 +Subproject commit e170cbe42b8f654894e4035c8ddfd6759a034be8 diff --git a/qtserialbus b/qtserialbus index 34d346c1..9f5b14b0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 34d346c161bf89a6a98d4782627a5c4f12271bde +Subproject commit 9f5b14b06775e91ac65dc3c0b0ea3a54235a93a2 diff --git a/qtspeech b/qtspeech index b7effcdb..35d8b9ea 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b7effcdb6fa3d6ef57c1b6c8ebf3dbd55b8f14da +Subproject commit 35d8b9ea60b41d1798ccd2e63db50c895213eff7 diff --git a/qtsvg b/qtsvg index bb80aeee..907c2db4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bb80aeee1fb19445889210ec913046d0ca385721 +Subproject commit 907c2db46915eedac02f2a5a26291d2ce19282f9 diff --git a/qttools b/qttools index 6e60c31d..bb3e078e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6e60c31d3513da3a9ec5e9a38326961bc6a32928 +Subproject commit bb3e078e2ed79e763b16c8c7f872b4ebfc576cb6 diff --git a/qttranslations b/qttranslations index e2ab6665..bb5f0ac7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e2ab66653d0c8ae59868ff5bc2a3a44d1b61cfd9 +Subproject commit bb5f0ac724b7179df25c7d7442991eceea1fd58d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 246c406f..f51ed61c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 246c406fc2bad945284704bb6613ae9adf3230ed +Subproject commit f51ed61cb1c3a3084cd9bfb42e4560fe8e6e4b2b diff --git a/qtwayland b/qtwayland index 88851b6d..c7e775ae 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 88851b6de433ab25047166bf4708e99e111b7af2 +Subproject commit c7e775aef78b655666916bba15196c89dbf0b43d diff --git a/qtwebengine b/qtwebengine index 0358558a..b74e93a9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0358558a3a22c0fdb586de95e4c48bced96ff6c5 +Subproject commit b74e93a9b07243da4f3d2784cde49916de455364 diff --git a/qtwebsockets b/qtwebsockets index 85e345a3..4321fd13 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 85e345a38709026d4d82c67b9016338675851249 +Subproject commit 4321fd13ac58e5bebe4d564431e9c18b627598bc diff --git a/qtxmlpatterns b/qtxmlpatterns index e95c186f..b9b94194 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e95c186fe8da96fba394490f9bca817534124b63 +Subproject commit b9b941945dc63a48652576c806e10dfeb15005e9 From 2a439be756513091614652448feaa0cfe018588d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Aug 2018 09:55:41 +0200 Subject: [PATCH 05/11] Update qtbase manually Change-Id: Ic48eee5dcf4b6f05713a6ab04c39cfcb6baa8bef Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 5a03b75c..c9c770d7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 +Subproject commit c9c770d775842a6c8ab60f951de25dd32b0bdb1e From 4b2a2d2d92c474de16e3093b0f898ce127f15eb2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Aug 2018 22:30:52 +0200 Subject: [PATCH 06/11] Update submodules on '5.12' in qt5 Change-Id: I82cbc9879fd675685e3ac4eb4b368f975c2a27a1 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index c9c770d7..ed557c03 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c9c770d775842a6c8ab60f951de25dd32b0bdb1e +Subproject commit ed557c037847e343caa010562952b398f806adcd diff --git a/qtconnectivity b/qtconnectivity index 322eb120..4a20dda2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 322eb120c9237a390ef4d1e29605222498729803 +Subproject commit 4a20dda27259fad1468370860162b8f22ca53072 diff --git a/qtdeclarative b/qtdeclarative index e3308076..6e2fc846 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e33080767e73c1fe9156a5423ff4a7c3e00e8470 +Subproject commit 6e2fc84646987135c96755fbe1c2af20fc722e3d diff --git a/qtdoc b/qtdoc index bf8e5b17..1c9da743 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bf8e5b17c12919005504432f37dc965c49c33159 +Subproject commit 1c9da7439d1d4664a91c0dd43162b47a2203b02c diff --git a/qtimageformats b/qtimageformats index 6a039e4e..2842212e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6a039e4e77cef7d590c973c27c03a4576d6f5362 +Subproject commit 2842212e88afb200a0fcfda7d306c4e8eee26407 diff --git a/qtlocation b/qtlocation index 480b5e16..34ee7672 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 480b5e168da11dc917dfd7ed8d44359d702eac83 +Subproject commit 34ee76720ee09ac692ea149ce44413cb5c0c7b99 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6272ba6c..d19f782a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6272ba6ced2d6dc5fdd651fce9e958ac7215ccd0 +Subproject commit d19f782a887e4a8c87ceee42ad8405a0b12388d0 diff --git a/qtremoteobjects b/qtremoteobjects index e170cbe4..20584755 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e170cbe42b8f654894e4035c8ddfd6759a034be8 +Subproject commit 20584755d916e55fecaf2292dc92d47899e7df9e 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/qttools b/qttools index bb3e078e..babc227f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bb3e078e2ed79e763b16c8c7f872b4ebfc576cb6 +Subproject commit babc227fa25733c1562eccd9623fd8a5f6bec688 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f51ed61c..726832a0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f51ed61cb1c3a3084cd9bfb42e4560fe8e6e4b2b +Subproject commit 726832a05c4400159d524b6f508cd25bf66da305 diff --git a/qtwayland b/qtwayland index c7e775ae..51768025 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c7e775aef78b655666916bba15196c89dbf0b43d +Subproject commit 51768025a100232743290fa07fc5c46821c16556 diff --git a/qtwebengine b/qtwebengine index b74e93a9..42a1f19e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b74e93a9b07243da4f3d2784cde49916de455364 +Subproject commit 42a1f19e3d06b8b23ab13c7479b754a05bee2b5e From 096780db16509caac2e2a09c7d98916286008ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 21 Aug 2018 15:37:48 +0300 Subject: [PATCH 07/11] Drop testing of macOS 10.11 in the CI The 10.11 configurations were bumped to 10.12 configurations. The 10.12 packaging configuration will be deleted once autotests have been enabled for 10.13 and packaging moved to 10.13 cross the board. Task-number: QTQAINFRA-2055 Change-Id: I17c598a306487e9a2f72006c3fa02e4ee683ee12 Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 4 +- .../qtci-osx-10.11-x86_64/01-crashreporter.sh | 5 -- .../01-sha1sum-compatibility.sh | 1 - .../01-system_updates.sh | 6 -- .../qtci-osx-10.11-x86_64/02-disable-ntp.sh | 3 - .../qtci-osx-10.11-x86_64/03-bashprofile.sh | 7 -- .../qtci-osx-10.11-x86_64/05-systemsetup.sh | 90 ------------------- .../06-disable_update_downloads.sh | 4 - .../qtci-osx-10.11-x86_64/07-SSL_keychain.sh | 10 --- .../qtci-osx-10.11-x86_64/15-xz.sh | 52 ----------- .../qtci-osx-10.11-x86_64/20-xcode.sh | 50 ----------- .../21-install-commandlinetools.sh | 46 ---------- .../qtci-osx-10.11-x86_64/25-cmake.sh | 6 -- .../qtci-osx-10.11-x86_64/25-homebrew.sh | 6 -- .../qtci-osx-10.11-x86_64/25-mysql.sh | 60 ------------- .../qtci-osx-10.11-x86_64/25-postgresql.sh | 57 ------------ .../qtci-osx-10.11-x86_64/25-python2.sh | 4 - .../qtci-osx-10.11-x86_64/25-python3.sh | 4 - .../qtci-osx-10.11-x86_64/26-p7zip.sh | 7 -- .../qtci-osx-10.11-x86_64/27-libclang.sh | 8 -- .../qtci-osx-10.11-x86_64/30-java.sh | 3 - .../qtci-osx-10.11-x86_64/90-squish.sh | 4 - 22 files changed, 2 insertions(+), 435 deletions(-) delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh delete mode 120000 coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh delete mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 1116680f..b4f0bc14 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,8 +14,8 @@ qtci-linux-openSUSE-42.3-x86_64 ICC_18 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-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 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 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh deleted file mode 100755 index 8461c656..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh deleted file mode 120000 index 58a40af4..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1 +0,0 @@ -../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh deleted file mode 100755 index 94b53309..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh deleted file mode 100644 index 32528873..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -$(dirname $0)/../common/unix/disable-ntp_macos.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh deleted file mode 100755 index 2c3e45f3..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# Read .bashrc if exist -printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh deleted file mode 100755 index 4a631b4f..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/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 modified system settings for automated use - -set -ex - -VNCPassword=qt -NTS_IP=10.212.2.216 - -echo "Disable Screensaver" -# For current session -defaults -currentHost write com.apple.screensaver idleTime 0 - -echo "Disable sleep" -sudo pmset sleep 0 displaysleep 0 - -# For session after a reboot -mkdir -p "$HOME/Library/LaunchAgents" -cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" < - - - - - Label - org.qt.io.screensaver_disable - ProgramArguments - - defaults - -currentHost - write - com.apple.screensaver - idleTime - 0 - - RunAtLoad - - KeepAlive - - - -EOT - -defaults write com.apple.screensaver askForPassword -int 0 - -echo "Set keyboard type rates and delays" -# normal minimum is 15 (225 ms) -defaults write -g InitialKeyRepeat -int 15 -# normal minimum is 2 (30 ms) -defaults write -g KeyRepeat -int 2 - -echo "Enable remote desktop sharing" -sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all - -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 - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh deleted file mode 100755 index 3c11214d..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/06-disable_update_downloads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex -BASEDIR=$(dirname "$0") -"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh deleted file mode 100755 index 610f7a8e..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -# Enables the usage of temporary keychains for SSL autotests -SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh deleted file mode 100755 index 13b05040..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/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 installs XZ-Utils - -# XZ-Utils are needed for uncompressing xz-compressed files - -set -ex - -# shellcheck source=../common/macos/InstallPKGFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg" -AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" -SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" -DestDir="/" - -InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" - -echo "XZ = 5.0.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh deleted file mode 100755 index a067f637..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 installs Xcode -# Prerequisites: Have Xcode prefetched to local cache as xz compressed. -# This can be achieved by fetching Xcode_8.xip from Apple Store. -# Uncompress it with 'xar -xf Xcode_8.xip' -# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py -# with which you can run 'python parse_pbzx2.py Content'. -# This will give you a file called "Content.part00.cpio.xz" that -# can be renamed to Xcode_8.xz for this script. - -set -ex - -# shellcheck source=../common/macos/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" - -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh deleted file mode 100755 index cb7dcfc6..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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 - -source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" - -version="8.2" -packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg" -url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25" - -InstallCommandLineTools $url $url $sha1 $packageName $version - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh deleted file mode 100755 index e5dd1910..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh deleted file mode 100755 index 0ead5a58..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh deleted file mode 100755 index 1908c79b..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs MySQL - -# MySQL is needed for Qt to be able to support MySQL - -set -ex - -# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" -AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" -SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" -appPrefix="" -targetDir="/opt/mysql57/" - -sudo mkdir -p "/opt" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" - -SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" - -echo "MySQL = 5.7.15" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh deleted file mode 100755 index 7fedb4a2..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/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 installs PostgreSQL - -# PostgreSQL is needed for Qt to be able to support PostgreSQL - -set -ex - -# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" -AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" -SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" -appPrefix="" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" - -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" - -echo "PostgreSQL = 9.6.0" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh deleted file mode 100755 index ef65edad..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python2.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh deleted file mode 100755 index 92b05bf3..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh deleted file mode 100755 index 15511332..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# Install 7z to be used from command line - -set -ex - -brew update -brew install p7zip diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh deleted file mode 100755 index 91872201..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# There is only one mac package -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh b/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh deleted file mode 100755 index 8877c40b..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/30-java.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh deleted file mode 100755 index 27ff15c3..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh - From 9a7555e54da2dd55f7b6580cf7497b2d5291f7ab Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Aug 2018 10:40:26 +0200 Subject: [PATCH 08/11] Fix failing assertions in QML when running under qemu Unfortunately the user-space emulation mode of qemu does not implement MADV_DONTNEED, which is a feature that the garbage collector of QML relies on. Patch is submitted to the qemu list and included here to fix the imminent issue we're seeing. Task-number: QTBUG-68349 Change-Id: I2bb15513a1e5a7ad03eeae98d77691336985a20f Reviewed-by: Sami Nurmenniemi Reviewed-by: Lars Knoll --- .../qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index b2057b21..edabeb0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -46,6 +46,78 @@ cd "$tempDir" #latest commit from the master proven to work git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f git submodule update --init pixman + +patch -p1 < +Date: Fri, 24 Aug 2018 10:38:29 +0200 +Subject: [PATCH] linux-user: add support for MADV_DONTNEED + +Most flags to madvise() are just hints, so typically ignoring the +syscall and returning okay is fine. However applications exist that do +rely on MADV_DONTNEED behavior to guarantee that upon subsequent access +the mapping is refreshed from the backing file or zero for anonymous +mappings. +--- + linux-user/mmap.c | 18 ++++++++++++++++++ + linux-user/qemu.h | 1 + + linux-user/syscall.c | 6 +----- + 3 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/linux-user/mmap.c b/linux-user/mmap.c +index 61685bf79e..cb3069f27e 100644 +--- a/linux-user/mmap.c ++++ b/linux-user/mmap.c +@@ -764,3 +764,16 @@ int target_msync(abi_ulong start, abi_ulong len, int flags) + start &= qemu_host_page_mask; + return msync(g2h(start), end - start, flags); + } ++ ++int target_madvise(abi_ulong start, abi_ulong len, int flags) ++{ ++ /* A straight passthrough may not be safe because qemu sometimes ++ turns private file-backed mappings into anonymous mappings. ++ Most flags are hints, except for MADV_DONTNEED that applications ++ may rely on to zero out pages, so we pass that through. ++ Otherwise returning success is ok. */ ++ if (flags & MADV_DONTNEED) { ++ return madvise(g2h(start), len, MADV_DONTNEED); ++ } ++ return 0; ++} +diff --git a/linux-user/qemu.h b/linux-user/qemu.h +index 4edd7d0c08..3c975909a1 100644 +--- a/linux-user/qemu.h ++++ b/linux-user/qemu.h +@@ -429,6 +429,7 @@ int target_munmap(abi_ulong start, abi_ulong len); + abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, + abi_ulong new_size, unsigned long flags, + abi_ulong new_addr); ++int target_madvise(abi_ulong start, abi_ulong len, int flags); + int target_msync(abi_ulong start, abi_ulong len, int flags); + extern unsigned long last_brk; + extern abi_ulong mmap_next_start; +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 11a311f9db..94d8abc745 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -11148,11 +11148,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + + #ifdef TARGET_NR_madvise + case TARGET_NR_madvise: +- /* A straight passthrough may not be safe because qemu sometimes +- turns private file-backed mappings into anonymous mappings. +- This will break MADV_DONTNEED. +- This is a hint, so ignoring and returning success is ok. */ +- ret = get_errno(0); ++ ret = get_errno(target_madvise(arg1, arg2, arg3)); + break; + #endif + #if TARGET_ABI_BITS == 32 +-- +2.17.1 +EOT + ./configure --target-list=arm-linux-user,aarch64-linux-user --static make sudo make install From 0125d70806a5310bf90a2c27c1f03d53b3774e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 25 Jul 2018 09:50:38 +0300 Subject: [PATCH 09/11] Provisioning: Disable spotlight in macOS While the VM we launch is a clean image the spotlight starts indexing right after the boot. That seems to require quite a lot of resources. Build machine doesn't need the feature, so we are disabling it. Change-Id: I2c5f0030d7a687cfbded4e9bd4da70302cb0a933 Reviewed-by: Liang Qi --- .../common/macos/disable_spotlight.sh | 38 +++++++++++++++++++ .../06-disable_spotlight.sh | 2 + .../06-disable_spotlight.sh | 2 + 3 files changed, 42 insertions(+) create mode 100755 coin/provisioning/common/macos/disable_spotlight.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh diff --git a/coin/provisioning/common/macos/disable_spotlight.sh b/coin/provisioning/common/macos/disable_spotlight.sh new file mode 100755 index 00000000..7c60b52b --- /dev/null +++ b/coin/provisioning/common/macos/disable_spotlight.sh @@ -0,0 +1,38 @@ +#!/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$ +## +############################################################################# + +# Disable spotlight and and stop indexing +sudo mdutil -a -i off +sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh new file mode 100755 index 00000000..d991e6c0 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +$(dirname "$0")/../common/macos/disable_spotlight.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh new file mode 100755 index 00000000..d991e6c0 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +$(dirname "$0")/../common/macos/disable_spotlight.sh From ba5211d85f1fe0daf1c133746e091bf6db91ee3a Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 21 Aug 2018 11:00:50 +0200 Subject: [PATCH 10/11] Provisioning: Fix open62541 on msvc2015 x86/x64 The correct vcvars resides in Visual Studio 14, not 12. Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040 Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/open62541.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 index 508e5b32..7e87cac4 100644 --- a/coin/provisioning/common/windows/open62541.ps1 +++ b/coin/provisioning/common/windows/open62541.ps1 @@ -206,12 +206,12 @@ if ($targetCommand.StartsWith("mingw")) { BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make" } elseif ($targetCommand -eq "msvc2015_x86") { Write-Host "### Creating Open62541 for MSVC2015 x86" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat x86" + MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86" PushDevEnvironment BuildAndInstallOpen62541 msvc2015 x86 jom } elseif ($targetCommand -eq "msvc2015_x64") { Write-Host "### Creating Open62541 for MSVC2015 x64" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat amd64" + MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64" PushDevEnvironment BuildAndInstallOpen62541 msvc2015 x64 jom } elseif ($targetCommand -eq "msvc2017_x86") { From 5745c4da94919c537e15d5f0edf09e3883416753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 21 Aug 2018 15:41:57 +0300 Subject: [PATCH 11/11] Cleanup of unused macOS 10.10 provisioning scripts Change-Id: Iae988527c2ed9a27bb724072064cd6d1dcd55f08 Reviewed-by: Liang Qi --- .../qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh | 1 - .../qtci-osx-10.10-x86_64/06-disable_update_downloads.sh | 4 ---- coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh | 4 ---- 3 files changed, 9 deletions(-) delete mode 120000 coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh delete mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh deleted file mode 120000 index 58a40af4..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1 +0,0 @@ -../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh deleted file mode 100755 index 3c11214d..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/06-disable_update_downloads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex -BASEDIR=$(dirname "$0") -"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh deleted file mode 100755 index ef65edad..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python2.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -source "${BASH_SOURCE%/*}/../common/macos/python2.sh"