diff options
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/11-conan.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/03-conan.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt | 21 |
6 files changed, 17 insertions, 7 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 index a9044256..a9044256 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 index 57428310..57428310 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 index 75c6a232..d33ceea8 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index a7ced8ae..0c910ea2 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/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,20 @@ 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 |