From 25b385764e4a7f4d08ce96ede995f0c7dac67309 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 13 Sep 2016 12:19:30 +0200 Subject: [PATCH 01/20] Add Qt Android Extras as dependency for Qt Purchasing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 743e2e8e..9bcdf4ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -262,7 +262,7 @@ branch = 5.6 status = preview [submodule "qtpurchasing"] - depends = qtbase + depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git From 8cdb619bce8a9611c61e7026332ed4a3607a9130 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Sep 2016 01:00:57 +0300 Subject: [PATCH 02/20] Update submodules on '5.6' in qt5 Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bd9f3c50..3370ab91 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd9f3c50df9ad782b49eb47edf6264f8c4e8ac74 +Subproject commit 3370ab9119df09ca14f7d4641c555e60c1b3f478 diff --git a/qtdeclarative b/qtdeclarative index 03e64ff6..82176ad2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 03e64ff6e60ebb2c0ea1b9f408d82367e68b6514 +Subproject commit 82176ad2090b236e3255a8b4ae26557e4bc932c0 diff --git a/qtquickcontrols b/qtquickcontrols index ffcdd1d6..3aee127f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ffcdd1d6742986e46920919800a382ecf7b58011 +Subproject commit 3aee127f969cabec0819d93d305d47afc4cf25d6 diff --git a/qtsvg b/qtsvg index 1ffd91a8..78bc4273 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1ffd91a8a0c7ddb901b3c91f0f5e475811994e59 +Subproject commit 78bc427395116bfaf3d99134f42aec5310020f8e diff --git a/qtwebengine b/qtwebengine index 44f41d30..ce2f1b14 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 44f41d30ed3efce2f1970dcd158555b41b38014d +Subproject commit ce2f1b140d2d417f925ec54c8a095981827f7e68 diff --git a/qtwebview b/qtwebview index aad32ba9..79351892 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 +Subproject commit 793518927073fe101149acdc6ba672c40c565027 From 90f5a25c661f6652cc83df58e8adb9ff6875f6ab Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 13 Sep 2016 19:30:02 +0300 Subject: [PATCH 03/20] Update Ruby on Win10 QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann --- coin/provisioning/common/helpers.ps1 | 20 +++++++++++++++++++ coin/provisioning/common/ruby.ps1 | 7 +++++++ .../provisioning/qtci-windows-10-x86/ruby.ps1 | 1 + .../qtci-windows-10-x86_64/ruby.ps1 | 1 + 4 files changed, 29 insertions(+) create mode 100644 coin/provisioning/common/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d7b957f3..055ce0a7 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -29,3 +29,23 @@ function Extract-Zip $destinationFolder = $shell.Namespace($Destination) $destinationFolder.CopyHere($zipfile.Items(), 16) } + +function BadParam +{ + Param ([string]$Description) + throw("You must specify $Description") +} + +function Download +{ + Param ( + [string] $OfficialUrl = $(BadParam("the official download URL")), + [string] $CachedUrl = $(BadParam("the locally cached URL")), + [string] $Destination = $(BadParam("a download target location")) + ) + try { + Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination + } catch { + Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination + } +} diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 new file mode 100644 index 00000000..343bacfc --- /dev/null +++ b/coin/provisioning/common/ruby.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" + +Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer +Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" +& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" From 99ff42545f4f3935858908278adf74cd02a91058 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 13 Sep 2016 19:35:38 +0300 Subject: [PATCH 04/20] Install Conan on Win10 QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 7 +++++++ coin/provisioning/qtci-windows-10-x86/conan.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 1 + 3 files changed, 9 insertions(+) create mode 100644 coin/provisioning/common/conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/conan.ps1 diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 new file mode 100644 index 00000000..4b4e0726 --- /dev/null +++ b/coin/provisioning/common/conan.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" + +Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer +Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" +& $installer /DIR=C:\Utils\Conan /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 new file mode 100644 index 00000000..6a91fce2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\conan.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 new file mode 100644 index 00000000..6a91fce2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\conan.ps1" From b6414f7d0880badf36ac95a639292b08ab2392f8 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 12 Sep 2016 18:13:54 +0300 Subject: [PATCH 05/20] Added conanfiles for qtwebkit Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 4 ++++ .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt create mode 100644 coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..f1d31a18 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -0,0 +1,4 @@ +[requires] +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt new file mode 100644 index 00000000..f1d31a18 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -0,0 +1,4 @@ +[requires] +icu/57.1@Vitallium/stable +libxml2-qt/2.9.4@Vitallium/stable +libxslt-qt/1.1.29@Vitallium/stable From 78a764ee65b1b380b73e1800bfeda54598aa4c8b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 14 Sep 2016 15:57:48 +0300 Subject: [PATCH 06/20] Install conan dependencies if there is conanfile.txt for module Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 26 +++++++++++++++++++ .../qtci-windows-10-x86/conan.ps1 | 7 +++++ .../qtci-windows-10-x86_64/conan.ps1 | 7 +++++ 3 files changed, 40 insertions(+) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 4b4e0726..355e0f18 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -5,3 +5,29 @@ $installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT + +function Run-Conan-Install +{ + Param ( + [string]$ConanfilesDir, + [string]$BuildinfoDir, + [string]$Arch, + [string]$Compiler, + [string]$CompilerVersion + ) + + Get-ChildItem -Path "$ConanfilesDir\*.txt" | + ForEach-Object { + $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + New-Item $outpwd -Type directory -Force + Start-Process ` + "C:\Utils\Conan\conan\conan.exe" ` + -WorkingDirectory $outpwd ` + -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` + -NoNewWindow -Wait + } + + [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") +} diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index 6a91fce2..dc299e7b 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -1 +1,8 @@ . "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir msvc-2015-x86 ` + -Arch x86 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 6a91fce2..8c979776 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -1 +1,8 @@ . "$PSScriptRoot\..\common\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir msvc-2015-x86_64 ` + -Arch x86_64 ` + -Compiler "Visual Studio" ` + -CompilerVersion 14 From 0958cc4ccaf874bce926e96de6287622766a7978 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 13:54:06 +0300 Subject: [PATCH 07/20] Changed BuildinfoDir of conan to use Coin-compatible compiler name Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index dc299e7b..a30be8d4 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86 ` + -BuildinfoDir MSVC2015-X86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 8c979776..759a251d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86_64 ` + -BuildinfoDir MSVC2015-X86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14 From fd6fe04cad632edc4e127038c5312cbe5ce6a17b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:00:28 +0300 Subject: [PATCH 08/20] Added cmake_installer, imports and explicit library types to conanfiles Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann --- .../qtci-windows-10-x86/conanfiles/qtwebkit.txt | 15 +++++++++++++++ .../conanfiles/qtwebkit.txt | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin From e1bfa77391fcf3d50f0d9f9375f5d123710395cf Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:18:46 +0300 Subject: [PATCH 09/20] Do not use qmake and cmake generator automatically for each conanfile Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 1 + .../provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 355e0f18..117cdfc6 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -23,7 +23,7 @@ function Run-Conan-Install Start-Process ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` - -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + -ArgumentList "install -i -f $($_.FullName)", ` '-s', ('compiler="' + $Compiler + '"'), ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 8e0447d0..d1fcbfba 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable [generators] +cmake virtualenv [options] diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 8e0447d0..d1fcbfba 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable [generators] +cmake virtualenv [options] From 23d11128396da8362f27d703287600699b5a962c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 17 Sep 2016 21:04:03 +0300 Subject: [PATCH 10/20] Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 117cdfc6..6d7cf07b 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") + function Run-Conan-Install { Param ( @@ -28,6 +30,4 @@ function Run-Conan-Install "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait } - - [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") } diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index a30be8d4..718d25de 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86 ` + -BuildinfoDir MSVC2015-x86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 759a251d..04887712 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-X86_64 ` + -BuildinfoDir MSVC2015-x86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14 From 6a8a0abf9ecb4e0fa15c71ee88837f9c0677a07f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Sep 2016 23:51:23 +0300 Subject: [PATCH 11/20] Update submodules on '5.6' in qt5 Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 1de9d68b..c3b34277 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1de9d68b2631de9432ab9929bb4b917604cc7be7 +Subproject commit c3b34277bc7b602185b2f4eccd19af270aa6b09d diff --git a/qtbase b/qtbase index 3370ab91..6b9c57f8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3370ab9119df09ca14f7d4641c555e60c1b3f478 +Subproject commit 6b9c57f8cd3df65702db327616913fa9d8172237 diff --git a/qtcanvas3d b/qtcanvas3d index 2778071f..6b6bda4c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2778071f6c80b5397a183db37114aef881ade855 +Subproject commit 6b6bda4c7fc419112386ca9b4fe89d092bf14cc5 diff --git a/qtconnectivity b/qtconnectivity index fc3c1d9e..9dba73f3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fc3c1d9e3b330b49d0442252966e6682ff0e2488 +Subproject commit 9dba73f30505ed7c220055788fba3cd201848fdb diff --git a/qtdeclarative b/qtdeclarative index 82176ad2..a273a0ad 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 82176ad2090b236e3255a8b4ae26557e4bc932c0 +Subproject commit a273a0ad9c1df7aed612ee6353753f668d545076 diff --git a/qtdoc b/qtdoc index aebe202e..ea17b457 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aebe202ec85d3a8a04772713786ffab838101934 +Subproject commit ea17b457b3b019685b5b72744aeaf3c5c2b7d53e diff --git a/qtlocation b/qtlocation index 7504b2ce..7cfd70fa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 +Subproject commit 7cfd70fa2f8fd24053d31122ac0a27eb56915895 diff --git a/qtmultimedia b/qtmultimedia index a8fe4b98..e535480e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a8fe4b989b2002d3fcb4e33afe16bd6fd2ff192b +Subproject commit e535480e13c2ba0483f4a25be90c5db82529c25c diff --git a/qtquickcontrols b/qtquickcontrols index 3aee127f..c2356328 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3aee127f969cabec0819d93d305d47afc4cf25d6 +Subproject commit c2356328f88b044c8956fe7860c4c04fca4f2c30 diff --git a/qtscript b/qtscript index 9dc78a2d..b4eb16b7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9dc78a2d847bca5ec7b1445356523383a030d7ce +Subproject commit b4eb16b7ffd7d281610765eab4332036d7d8f81c diff --git a/qtsensors b/qtsensors index 46d9a630..72400841 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 +Subproject commit 724008411c16aaf8fa25c09745e20d0d47d65721 diff --git a/qtserialbus b/qtserialbus index c8305c87..3dfc46f0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 +Subproject commit 3dfc46f069f3287c411ab178513d0ad47bf95352 diff --git a/qtserialport b/qtserialport index b0e3e746..dd179422 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0e3e7469cf5249bb395d044c5344bbe88884553 +Subproject commit dd17942259cf0cbe834f504128d522c93020ea84 diff --git a/qttools b/qttools index 1285db5b..316720b4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1285db5b12c6041a5d1c55d07113ce75a9d76e3a +Subproject commit 316720b417a8360d2dfa24e9f3924fc46ef590e3 diff --git a/qtwayland b/qtwayland index a96dec76..90123a9f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a96dec760b19c85c67fb0cca649c22a12e7f51f5 +Subproject commit 90123a9f30ee1173c9d64e415fc9b6e27a4227fc diff --git a/qtwebengine b/qtwebengine index ce2f1b14..9c0bd920 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ce2f1b140d2d417f925ec54c8a095981827f7e68 +Subproject commit 9c0bd9207560e36e7bad3657e02305aabd7638b9 diff --git a/qtwebkit b/qtwebkit index bb43bca1..7be99344 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bb43bca1664721401c3a2c25b585913bb5e8cb4f +Subproject commit 7be993442fac143ef7b13515b70f0ebacaca2935 diff --git a/qtwebview b/qtwebview index 79351892..16887a02 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 793518927073fe101149acdc6ba672c40c565027 +Subproject commit 16887a0294346edcdf0a912a69e2da892e4fd0e8 diff --git a/qtwinextras b/qtwinextras index 75385854..9ca1e678 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 75385854e5973b28d13055d8896cb00380951466 +Subproject commit 9ca1e678976d06d23b236011a3a55a025a272320 From 891afe7066a0791f2a8f861c55328af4e3a0ddd3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 19 Sep 2016 02:30:49 +0300 Subject: [PATCH 12/20] Update submodules on '5.7' in qt5 Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index 88ca1827..73e1f94e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 88ca1827cf6532b0e8d4fbacb4bc87a515c2cff4 +Subproject commit 73e1f94e557709a3c4d59eb94314701319c3c1d8 diff --git a/qtactiveqt b/qtactiveqt index 5508cd19..4329879b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5508cd19d17c2b2a94aef94be2b4dcdbb29377e8 +Subproject commit 4329879b4d73936fe757591f19cb2a86cae1d6b7 diff --git a/qtbase b/qtbase index cf88d744..8d64d1e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cf88d74466cd6506875676ef2557c179d72fe422 +Subproject commit 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 diff --git a/qtcanvas3d b/qtcanvas3d index 269b1d56..8e34d6f5 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 269b1d5699f6c95d46553e7ee547f1c4b7545e63 +Subproject commit 8e34d6f5399a29d45f9402219f13b631e29fd4b0 diff --git a/qtcharts b/qtcharts index bf26aa9d..a64d9547 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit bf26aa9d15e525fdcf6fd3f59268418533f06790 +Subproject commit a64d954717a4b7fecc8eeea001e4a77483985132 diff --git a/qtconnectivity b/qtconnectivity index ecc2ca9e..aabce3a0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ecc2ca9e9e6b98e8da7c7d223cfa5eb5257591d6 +Subproject commit aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 diff --git a/qtdeclarative b/qtdeclarative index 48dce247..345226aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 48dce24717ca537a6f5d817b2f5cd689df86ad68 +Subproject commit 345226aa3ecee8642c3bf46e40c981d4a49d958e diff --git a/qtimageformats b/qtimageformats index ca1370e2..11300c62 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ca1370e27a4f86771809b4499da9dc61807ba03e +Subproject commit 11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e diff --git a/qtlocation b/qtlocation index c78af343..5d048160 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c78af3434956645b68dd13ab6b8a945239c5782c +Subproject commit 5d0481603414a4584dbfe89aaba48a6135b9e2d8 diff --git a/qtmacextras b/qtmacextras index f3d6e8ee..237ad2f2 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f3d6e8eed740aff58891827e0061d213a7e512cb +Subproject commit 237ad2f2f0850a35aec92776b968db3965d352c9 diff --git a/qtmultimedia b/qtmultimedia index da7d462e..256ee311 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit da7d462e315fb101fc9112a294b5ca2e3bd35a75 +Subproject commit 256ee311b936d69561e97f7f8ee832cff93cb509 diff --git a/qtpurchasing b/qtpurchasing index dc6d9e0e..e8433841 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dc6d9e0ef119d2d4337c6366669220443e553e6f +Subproject commit e843384150e7b3cad3e837d611c50f6db4d85942 diff --git a/qtquickcontrols b/qtquickcontrols index abe319c9..d9aae9ff 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit abe319c9cb811832bb4c9c95290564dfa7b3603a +Subproject commit d9aae9ff99d20b58487b0a48801864d13115363b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9ae57848..ffdb00d9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9ae57848671419b2622e254af8642fef7b1b7c33 +Subproject commit ffdb00d903ca343ac08ffb44535956d6fad9ae49 diff --git a/qtscript b/qtscript index 52873703..42f94f30 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 52873703412bce5d295a1351d32b0f72fb4bedd9 +Subproject commit 42f94f30488a01751f387dc9bd3160ce1b4dfa58 diff --git a/qtsensors b/qtsensors index beac0b2e..ecd018fe 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit beac0b2e3ea4b292f0473c00bcf68d75360f89ef +Subproject commit ecd018fe2ee4508e094f631d882ecc1360abec01 diff --git a/qtserialbus b/qtserialbus index 398eda8b..e13f9fe6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 398eda8be9eb3415ca44cc35dad3422311d8e221 +Subproject commit e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a diff --git a/qtserialport b/qtserialport index 10967b14..a840a9ea 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 10967b1443720116744ecfc42fe442681d149c5a +Subproject commit a840a9ea5548044c1901f5d4008aaa00553f99d7 diff --git a/qtsvg b/qtsvg index 4469fbec..d3d3db5a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4469fbecd4e004979dada2da72573c06719fee3c +Subproject commit d3d3db5a75fe2ba992742e418bfefa25eddf7684 diff --git a/qttools b/qttools index 781efbab..d974321a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 781efbabf32e4438ae9c698ce498cc32cc900c57 +Subproject commit d974321ae490f15f987bc587819a5536fdcf4a8f diff --git a/qttranslations b/qttranslations index 38d6c3fe..19b6455c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 38d6c3fe848487970640068ec12fc0c87a2938ee +Subproject commit 19b6455cbde56b340ec406f7b5bfdeb1c72c656a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index ad1da1a8..5ac6b611 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit ad1da1a8c3be6ec804f3965b47d0762654f81731 +Subproject commit 5ac6b611b196c66bc8b01c23aa50d175ae7a7308 diff --git a/qtwayland b/qtwayland index 2f83f449..fcaa38c8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2f83f4490b6c644bb02fa6bf9d88e87492418723 +Subproject commit fcaa38c84dc92ec951c43e1759d7a46080755cbc diff --git a/qtwebengine b/qtwebengine index 3cc14885..099ffa62 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3cc148853f0f7468526df9dd2397a70a8eeeedae +Subproject commit 099ffa623920355f3a70402ddfa49dd1a3ecb2f0 diff --git a/qtwebkit b/qtwebkit index 01676ca2..4671ed5b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 01676ca2ffb25adfe331a3b50792ac99687d5319 +Subproject commit 4671ed5b9df8f8edd3856b24bab93d7246f700f5 diff --git a/qtwebsockets b/qtwebsockets index 38d830d0..6bef834d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 38d830d00fc2f8c196d736094448e55623e4b35e +Subproject commit 6bef834d17ea9978b99e309eb396e10c8b9fba4c diff --git a/qtwebview b/qtwebview index 08cb6659..3223c849 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 08cb6659a4bfd441760c26ab7f405c439c7d6ca3 +Subproject commit 3223c849260d231cb1dd06c69ef65f28f3347e3f diff --git a/qtwinextras b/qtwinextras index 93a998f5..0b705525 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 93a998f5ef31f7d9f8dd72909c4342db84cc1b59 +Subproject commit 0b70552561919630f7a16b20bf1b1eec0e2ac8cb diff --git a/qtxmlpatterns b/qtxmlpatterns index 332ef472..89dbcc4f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 332ef472a9597822cd29da143f27c8e4083af621 +Subproject commit 89dbcc4f807015736a8ce3393b857735019d098d From 7c6a3f423a84cfdd96ae1734f7daf64af5577d07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Sep 2016 02:30:54 +0300 Subject: [PATCH 13/20] Update submodules on '5.7' in qt5 Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 73e1f94e..7e638edb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 73e1f94e557709a3c4d59eb94314701319c3c1d8 +Subproject commit 7e638edbd15640302516f9a69d20f62d26d4af06 diff --git a/qtdoc b/qtdoc index 02bf1659..c7ecd300 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02bf1659f701d222ad3f95f82f13948a75635e79 +Subproject commit c7ecd300ab0c0cb7a9bafedab2ef792cdfa4d25d diff --git a/qtlocation b/qtlocation index 5d048160..42372ce4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5d0481603414a4584dbfe89aaba48a6135b9e2d8 +Subproject commit 42372ce4c4114f7e38fc5ac681e9199869b4619f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ffdb00d9..85230f22 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ffdb00d903ca343ac08ffb44535956d6fad9ae49 +Subproject commit 85230f227f38d56572ad4650dda9fcce3942f86d diff --git a/qtserialport b/qtserialport index a840a9ea..fcd6ac23 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a840a9ea5548044c1901f5d4008aaa00553f99d7 +Subproject commit fcd6ac231d160afd5c11cc5ef515dcc61c3eca3f diff --git a/qttools b/qttools index d974321a..181b320c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d974321ae490f15f987bc587819a5536fdcf4a8f +Subproject commit 181b320c95e88be0a8e0843f14d134ae219181a3 diff --git a/qtwebengine b/qtwebengine index 099ffa62..0e5553a1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 099ffa623920355f3a70402ddfa49dd1a3ecb2f0 +Subproject commit 0e5553a1626cb707499d82c96e136ceb79dfb54d From 3f7e68f8c0031f3aa41a773fe9ea09812b7e10c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Sep 2016 23:33:36 +0300 Subject: [PATCH 14/20] Update submodules on '5.6' in qt5 Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index c3b34277..e5878886 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c3b34277bc7b602185b2f4eccd19af270aa6b09d +Subproject commit e5878886ed8261fb5d3e1fb93595be03e8f12b8d diff --git a/qtbase b/qtbase index 6b9c57f8..d95cb94b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6b9c57f8cd3df65702db327616913fa9d8172237 +Subproject commit d95cb94baa6302bea6ad57a9690453e9b618421e diff --git a/qtdeclarative b/qtdeclarative index a273a0ad..f5e2783a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a273a0ad9c1df7aed612ee6353753f668d545076 +Subproject commit f5e2783acec1f46070330fc1ce90cb16901a5533 diff --git a/qtdoc b/qtdoc index ea17b457..f822f094 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea17b457b3b019685b5b72744aeaf3c5c2b7d53e +Subproject commit f822f0944a5bc6710df173f3fec67ae1e364ab85 diff --git a/qtlocation b/qtlocation index 7cfd70fa..8cb45ab8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7cfd70fa2f8fd24053d31122ac0a27eb56915895 +Subproject commit 8cb45ab8aabaf0246c49e3314e4a84456ff7b061 diff --git a/qtmultimedia b/qtmultimedia index e535480e..9d9a29bc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e535480e13c2ba0483f4a25be90c5db82529c25c +Subproject commit 9d9a29bcc31101e394ea484f61985cac75524ba1 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 diff --git a/qtwebengine b/qtwebengine index 9c0bd920..36feb681 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9c0bd9207560e36e7bad3657e02305aabd7638b9 +Subproject commit 36feb681a97b3dd690a54d2eafd58081036992f1 diff --git a/qtwebkit b/qtwebkit index 7be99344..490b7b65 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7be993442fac143ef7b13515b70f0ebacaca2935 +Subproject commit 490b7b65edbd06da0818c0ac765ca6ebd219dce3 From 233d142e8e9c88245781e92d83d350f7e6068e62 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 01:00:49 +0300 Subject: [PATCH 15/20] Update submodules on '5.6' in qt5 Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index d95cb94b..8e45fe6d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d95cb94baa6302bea6ad57a9690453e9b618421e +Subproject commit 8e45fe6d6c2084752983d905cf22f777e7062baf From dcc26dafadcf365baca0f3fabfd0a9707a63f0ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Sep 2016 15:21:23 +0300 Subject: [PATCH 16/20] Update submodules on '5.7' in qt5 Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 4329879b..829abebf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4329879b4d73936fe757591f19cb2a86cae1d6b7 +Subproject commit 829abebf3334218182d6b334855e4ae4658575f4 diff --git a/qtbase b/qtbase index 8d64d1e0..680dd331 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8d64d1e0c3f7ebcee859e8b5f40aa27a8df86351 +Subproject commit 680dd3313cd15ab4d9d6b8b3bde77aabbd8de0b0 diff --git a/qtdeclarative b/qtdeclarative index 345226aa..0aea0094 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 345226aa3ecee8642c3bf46e40c981d4a49d958e +Subproject commit 0aea009425242417bffdb171c8eca02ff52f4a7b diff --git a/qtmultimedia b/qtmultimedia index 256ee311..62eeaba6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 256ee311b936d69561e97f7f8ee832cff93cb509 +Subproject commit 62eeaba645d0f7c42246a0b026c532919a5b0454 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 85230f22..56bddc7f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 85230f227f38d56572ad4650dda9fcce3942f86d +Subproject commit 56bddc7fa4b0222d38fcc5e083b9588c3d2f8b93 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 diff --git a/qtserialbus b/qtserialbus index e13f9fe6..b3d27c68 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a +Subproject commit b3d27c681ac216f82ea8b2de1e21858a6c2b7af0 diff --git a/qtserialport b/qtserialport index fcd6ac23..dee818e7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fcd6ac231d160afd5c11cc5ef515dcc61c3eca3f +Subproject commit dee818e77a6cf9a6c164fbc7ee132fe875f7f998 diff --git a/qttranslations b/qttranslations index 19b6455c..c4795ce8 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 19b6455cbde56b340ec406f7b5bfdeb1c72c656a +Subproject commit c4795ce81f9165a05e6f918066c671808447c539 diff --git a/qtwebengine b/qtwebengine index 0e5553a1..a301473c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0e5553a1626cb707499d82c96e136ceb79dfb54d +Subproject commit a301473c4bd2a2956ea4986679b4a80f01bce2d9 From ec6d9b53b4cedd3c0d52d15de968a910effc63b2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 16:57:26 +0300 Subject: [PATCH 17/20] Update submodules on '5.7' in qt5 Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index a301473c..91679cda 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a301473c4bd2a2956ea4986679b4a80f01bce2d9 +Subproject commit 91679cda526857bd915c646d171f018ba86469f4 From b0b0c9c471359393697389c870aaaad51dbb022f Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 18 Sep 2016 18:20:45 +0300 Subject: [PATCH 18/20] Changed slash direction in CI_CONAN_BUILDINFO_DIR Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 6d7cf07b..70962a41 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,7 +6,7 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT -[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:/Utils/conanbuildinfos", "Machine") function Run-Conan-Install { From 5ee2290c0c9d21230c46ba19f44e0a1f1ec772bf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 01:00:49 +0300 Subject: [PATCH 19/20] Update submodules on '5.6' in qt5 Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8e45fe6d..6ea626a3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e45fe6d6c2084752983d905cf22f777e7062baf +Subproject commit 6ea626a32fe070847629b6715c2a253717ff7412 diff --git a/qtdeclarative b/qtdeclarative index f5e2783a..79121a08 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5e2783acec1f46070330fc1ce90cb16901a5533 +Subproject commit 79121a0827df365468a02db20179d2c2d5ae720d diff --git a/qtserialbus b/qtserialbus index 3dfc46f0..0d31e8cd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3dfc46f069f3287c411ab178513d0ad47bf95352 +Subproject commit 0d31e8cd10d09fd2b28052c89a4f96c32c104848 From 657cab9312005308ee5204afd871325b4369af08 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2016 02:30:47 +0300 Subject: [PATCH 20/20] Update submodules on '5.7' in qt5 Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 7e638edb..eb0a7293 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e638edbd15640302516f9a69d20f62d26d4af06 +Subproject commit eb0a7293838234dba401fe96731f1fb5908fb7ac diff --git a/qtbase b/qtbase index 680dd331..8cd28ea8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 680dd3313cd15ab4d9d6b8b3bde77aabbd8de0b0 +Subproject commit 8cd28ea8850c5365c47dd65de16f528e2e223835 diff --git a/qtdoc b/qtdoc index c7ecd300..dab8e210 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7ecd300ab0c0cb7a9bafedab2ef792cdfa4d25d +Subproject commit dab8e210a5ed80e42499658fe662873e888d37b4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 56bddc7f..966c0348 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 56bddc7fa4b0222d38fcc5e083b9588c3d2f8b93 +Subproject commit 966c0348c7a19a17c5be53f87ef54d4fbab8d8c8