summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-08-02 12:14:55 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-03 00:02:43 +0200
commita94696ccd5be936099809eda58db02999cb7c77a (patch)
treed8405a9848a24535aa86951305bdef035e4a7cc8 /coin/provisioning/qtci-windows-10-x86_64
parent4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff)
parent125c5e6528abee7796f6e5b68526bc050bd9250e (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1)22
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt23
2 files changed, 38 insertions, 7 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
index c2068666..a651bb0c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
@@ -31,3 +31,23 @@ Run-Conan-Install `
-Compiler "Visual Studio" `
-CompilerVersion 15 `
-CompilerRuntime MD
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir Mingw73-x86 `
+ -Arch x86 `
+ -Compiler "gcc" `
+ -CompilerVersion 7 `
+ -CompilerLibcxx "libstdc++" `
+ -CompilerException "dwarf2" `
+ -CompilerThreads "posix"
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir Mingw73-x86_64 `
+ -Arch x86_64 `
+ -Compiler "gcc" `
+ -CompilerVersion 7 `
+ -CompilerLibcxx "libstdc++" `
+ -CompilerException "seh" `
+ -CompilerThreads "posix"
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 a7ced8ae..4d9ca4b9 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -1,7 +1,8 @@
[requires]
-icu/59.1@vitallium/stable
-libxml2/2.9.4@vitallium/stable
-libxslt/1.1.29@vitallium/stable
+icu/64.2@qtproject/stable
+libxml2/2.9.9@qtproject/stable
+libxslt/1.1.33@qtproject/stable
+libjpeg-turbo/2.0.2@qtproject/stable
[generators]
cmake
@@ -9,12 +10,22 @@ txt
[options]
icu:shared=True
+icu:data_packaging=library
+
libxml2:shared=True
+libxml2:iconv=False
+libxml2:icu=True
+libxml2:zlib=False
+
libxslt:shared=True
+libjpeg-turbo:shared=False
+
[imports]
-bin, icudt59.dll -> ./bin
-bin, icuin59.dll -> ./bin
-bin, icuuc59.dll -> ./bin
+lib, icudt64.dll -> ./bin
+lib, icuin64.dll -> ./bin
+lib, icuuc64.dll -> ./bin
bin, libxml2.dll -> ./bin
bin, libxslt.dll -> ./bin
+bin, libxml2-2.dll -> ./bin
+bin, libxslt-1.dll -> ./bin