aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2016-12-25 18:27:10 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2016-12-25 18:12:11 +0000
commitffa5fe8b2f72a3c09aea5076b7d542d2cfe30932 (patch)
tree5283974c3c281f74495a6deab5b512a64166042f
parent7cfb602367b360b37f56fd7ccbf95d9a8f24780e (diff)
parent678fcb4e66763a4352e1fe0a1a423d09e38d7a8c (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
-rw-r--r--coin/provisioning/common/02-python.ps12
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh4
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh5
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh6
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.10/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.11/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.8/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.9/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt4
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt)20
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt4
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt13
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt16
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt4
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt (renamed from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt)20
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt4
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt13
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt16
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-msys.ps114
-rw-r--r--coin/provisioning/qtci-windows-7-x86/android_openssl.ps132
30 files changed, 241 insertions, 56 deletions
diff --git a/coin/provisioning/common/02-python.ps1 b/coin/provisioning/common/02-python.ps1
index c3e5fcdb..32972830 100644
--- a/coin/provisioning/common/02-python.ps1
+++ b/coin/provisioning/common/02-python.ps1
@@ -64,3 +64,5 @@ del $package
Add-Path $path
& python -m ensurepip
+# Install python virtual env
+pip.exe install virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..b419f217
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -0,0 +1,4 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+sudo yum install -y python-devel python-virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..ad1bf18f
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -0,0 +1,5 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+sudo subscription-manager refresh
+sudo yum install -y python-devel python-virtualenv
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..205f598b
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
@@ -0,0 +1,6 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+
+sudo apt-get update
+sudo apt-get install -y python-dev
diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh
index 2f7e2e47..2f7e2e47 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh
diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.10/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>Label</key>
+ <string>org.qt.io.screensaver_disable</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>defaults</string>
+ <string>-currentHost</string>
+ <string>write</string>
+ <string>com.apple.screensaver</string>
+ <string>idleTime</string>
+ <string>0</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>KeepAlive</key>
+ <false/>
+ </dict>
+</plist>
+EOT
diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.11/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>Label</key>
+ <string>org.qt.io.screensaver_disable</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>defaults</string>
+ <string>-currentHost</string>
+ <string>write</string>
+ <string>com.apple.screensaver</string>
+ <string>idleTime</string>
+ <string>0</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>KeepAlive</key>
+ <false/>
+ </dict>
+</plist>
+EOT
diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.8/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>Label</key>
+ <string>org.qt.io.screensaver_disable</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>defaults</string>
+ <string>-currentHost</string>
+ <string>write</string>
+ <string>com.apple.screensaver</string>
+ <string>idleTime</string>
+ <string>0</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>KeepAlive</key>
+ <false/>
+ </dict>
+</plist>
+EOT
diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.9/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>Label</key>
+ <string>org.qt.io.screensaver_disable</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>defaults</string>
+ <string>-currentHost</string>
+ <string>write</string>
+ <string>com.apple.screensaver</string>
+ <string>idleTime</string>
+ <string>0</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>KeepAlive</key>
+ <false/>
+ </dict>
+</plist>
+EOT
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
index 685e4549..392eb24f 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
-1478098249
-conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file
+1482492127
+conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt
index 97af4669..ab1bd501 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt
@@ -1,8 +1,10 @@
-1478097969
-bin/icudt57.dll: 87bbc24187330408f9d7cb056060e0ad
-bin/icuin57.dll: 10bcbdf7ce17871d7ac0fe560a58493e
-bin/icuuc57.dll: 2f252173e83d958205d83e168af27bd1
-conaninfo.txt: 93a147af5e69ef5fc1628b5f401d2e72
+1482491156
+bin/icudt57.dll: 31229bc6cadb43b991620f7d9e9baa06
+bin/icuin57.dll: 3f0eb9f4e2b0e4012afa16f83e9ff0dc
+bin/icutest57.dll: ff878466aa02fa1bddfb94ba17b246a8
+bin/icutu57.dll: fef065fefce5fc67ef4a43b666d147d0
+bin/icuuc57.dll: cc8db4d8a1ee20f4e8a46041ef06862f
+conaninfo.txt: 13f4fa914f5920b05e5b228be8679454
include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
@@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: 375f9aff64352ed211a704156f40b206
-lib/icuin.lib: 752c472eb6f90acde3372894a68e2291
-lib/icuuc.lib: 1f493156171786bf782d85ca6ae017bf \ No newline at end of file
+lib/icudt.lib: 6ca31dc410effd400636e14cbc616324
+lib/icuin.lib: d3a00a713d384bd66094e2270d98ad2d
+lib/icutest.lib: 4ee3e48e551b0f14c992cafd5f5565ba
+lib/icutu.lib: d3b931010519ec185efa3b41837f6a72
+lib/icuuc.lib: 209fc74475de9d7244b0780771a4d8ed
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
index c80be750..c958bb87 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
-1478189855
-conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file
+1482493404
+conanfile.py: 4c879159bebcecec85173f085cd4c3c7
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt
index 8d769861..e16c2976 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt
@@ -1,6 +1,6 @@
-1478189644
-bin/libxml2.dll: 622bde2aec1d514bbf4ffcdcd734dbb7
-conaninfo.txt: a27084d89e21b40687c65926b75cf057
+1482493099
+bin/libxml2.dll: f43264365ba9d2681455ff106303a4e9
+conaninfo.txt: b51d149c110dea2bef2ab37017308696
include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
-include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9
include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: 61e2849cbb7376a17665994d68f7c9b4
-lib/libxml2_a.lib: c4bae1030473a5473ecc77cdf5af397d
-lib/libxml2_a_dll.lib: 98c11a0804ff364feb161bfa1214bc63 \ No newline at end of file
+lib/libxml2.lib: ec17f6714da6647f63d2cdc54d005e43
+lib/libxml2_a.lib: abae79bdfded67d5017604b7b7c8dd03
+lib/libxml2_a_dll.lib: f68e18d65520175beb3a8de99cbb7e9b
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
index 439e0dbf..be77d721 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
1478438034
-conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file
+conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
index d0ded34a..22a7c428 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
@@ -1,7 +1,7 @@
-1478437844
-bin/libexslt.dll: f57633ce0800d9041ba0040d8fbc9734
-bin/libxslt.dll: 20016a1ea3bc1625cb28e807787d8c93
-conaninfo.txt: 49fd643454ba3c15665b78805623c650
+1482494566
+bin/libexslt.dll: 656ebfef4dcd7d299bff8f5123bfd4b9
+bin/libxslt.dll: cdca16a3183ddcbdf3d0087c3f1e62e9
+conaninfo.txt: 73548fb3ff61aade734c0ce2071a2d05
include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
@@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
-lib/libexslt.lib: 424b0512b9a5c474e0f67bc6620b778a
-lib/libexslt_a.lib: ae779d86d57ce47bd3f088525126c98a
-lib/libxslt.lib: ca7513e26e38cb34f826eee424bafe8f
-lib/libxslt_a.lib: 5fcc830c7af32b7b328335b81ef81999 \ No newline at end of file
+lib/libexslt.lib: a84716fa57d325856a55cf5ba8a816c6
+lib/libexslt_a.lib: c428937c93542c6386534b61239e8119
+lib/libxslt.lib: 43b2e966367546ff110762f24f4c919d
+lib/libxslt_a.lib: a802233763886894a7a89e4f8e634e6a
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
index 685e4549..392eb24f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
-1478098249
-conanfile.py: f66225cf233d8eee6c6c6b4832d81b79 \ No newline at end of file
+1482492127
+conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt
index e4212811..d2d84a21 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt
@@ -1,8 +1,10 @@
-1478098455
-bin/icudt57.dll: 672be38b9176350208e62915e3d22bd7
-bin/icuin57.dll: e14d1d399efb686d4680073ae0452d59
-bin/icuuc57.dll: 9d47b44bd2a382509ffe67c52085467f
-conaninfo.txt: 58d139c57d36025b13c7691cc6fe02d6
+1482492365
+bin/icudt57.dll: 9424922f2422576e81509aad8911629d
+bin/icuin57.dll: 731ea41a670e4913d4dbeb9cf2fb300d
+bin/icutest57.dll: 0103d75f36194e398d8b89c12a6fb6f3
+bin/icutu57.dll: a94d3824640e025353d025a3f50caf10
+bin/icuuc57.dll: 96ecbd9165898f291b3920609ade6096
+conaninfo.txt: 05bf80d930c44b525645a86d8fd1084d
include/unicode/alphaindex.h: e74fcba85b76577d32b90bc0056ee5d9
include/unicode/appendable.h: 5c2d97a96252e2c959d4c226a554575b
include/unicode/basictz.h: 444077f7dd19bd6dbe24034360356e8a
@@ -171,6 +173,8 @@ include/unicode/utypes.h: 21e5e8cc7dc66bdb83f70971bed1a5e4
include/unicode/uvernum.h: d878c9e384487c8668c122712134c0f1
include/unicode/uversion.h: 140b36fa9bffd2cb2b1c7f02691923e6
include/unicode/vtzone.h: 90e065183436be0a94918465f66be863
-lib/icudt.lib: 8feb46831d7f9ff4f851ddb4a3b86287
-lib/icuin.lib: 27e6dd91a18fb61c4e92c5155efec652
-lib/icuuc.lib: cf6f30f41e57d2d7094b450d766a390a \ No newline at end of file
+lib/icudt.lib: cf92bb1d1fc1ffea58e7058134fd0f71
+lib/icuin.lib: eca7f889859a2078dba5ae0c228bb45f
+lib/icutest.lib: daf163f500ea14d3eafcb2e7885b5f2f
+lib/icutu.lib: 6236376ec549a1daba31f7b34cdbb957
+lib/icuuc.lib: f3cfefda92e691c3f81cae2ac3fdff14
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
index c80be750..c958bb87 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
-1478189855
-conanfile.py: 2d514c8a822e7432b8d2e030c3d17693 \ No newline at end of file
+1482493404
+conanfile.py: 4c879159bebcecec85173f085cd4c3c7
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt
index 8df25ad7..4b9ecc61 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt
@@ -1,6 +1,6 @@
-1478189807
-bin/libxml2.dll: b86b5aa939f258befbaca3cda811b371
-conaninfo.txt: 1542aee37a2d33374417a5a745c77d0f
+1482493354
+bin/libxml2.dll: 0b02196ac933431b150fb73a5bed7518
+conaninfo.txt: 29ccd6acef148fd29fc8ebee20216618
include/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml/HTMLparser.h: 083a413aedc738e1903735b7f1678087
include/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -44,13 +44,12 @@ include/libxml/xmlschemastypes.h: 160197e01dfa56cd9ad09d201d5bdeb4
include/libxml/xmlstring.h: 82efb8a055d5fc8eb7d815ed471eca53
include/libxml/xmlunicode.h: b9f0b8acddfee9b620ea822978a51d29
include/libxml/xmlversion.h: 0c268947477509833b9edc4ae096da41
-include/libxml/xmlwin32version.h: 0c672b45ad0bbc3285870375ac5e62c9
include/libxml/xmlwriter.h: 8694436144b1fb0aab2e2d6b725035e3
include/libxml/xpath.h: 2e60b359a61db15d05409ebef1b140b1
include/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/win32config.h: 410df263529fb9ec616b22f590dbdd1d
include/wsockcompat.h: f975f4dc926c27ab755f05a79296bd72
-lib/libxml2.lib: 814daf6ff042d2110b047da877b075d7
-lib/libxml2_a.lib: c85b4ef8c9e404369a140134a450f98c
-lib/libxml2_a_dll.lib: 2cac7d585f12fef63dfbe20f470f2d5e \ No newline at end of file
+lib/libxml2.lib: 7ab0a2cf0511ea7eb2593a24e5a31750
+lib/libxml2_a.lib: a4d10046b1cf6910811687a04ef38d6f
+lib/libxml2_a_dll.lib: f785611927ed7f3a9514a1ccac31fd10
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
index 439e0dbf..be77d721 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
@@ -1,2 +1,2 @@
1478438034
-conanfile.py: 2472a82109b2d59062d3e50a54d08a4a \ No newline at end of file
+conanfile.py: 2472a82109b2d59062d3e50a54d08a4a
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
index f0bffa50..0820b583 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
+++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
@@ -1,7 +1,7 @@
-1478437988
-bin/libexslt.dll: bace70c121c29fd8b9e29ce7ea924367
-bin/libxslt.dll: 00022b72c0cacd3c3ca7bc48a0ec4632
-conaninfo.txt: cba36a71cb20255ea805a39e62e79070
+1482494796
+bin/libexslt.dll: acf1f58607eb1a10534cc30ca2bf2c9f
+bin/libxslt.dll: 9edc15648704934221ec3afcedb25451
+conaninfo.txt: 224814c47f7d14968c401d2180974e77
include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
include/libexslt/exsltconfig.h: a36134fd73a90b0c39ba3eb4fa8833b9
include/libexslt/exsltexports.h: 079c35b6fa14302aad0764c1dee57809
@@ -32,7 +32,7 @@ include/libxslt/xsltexports.h: 207ffe4e458a8c24635b3eb24bdd8000
include/libxslt/xsltlocale.h: b934279cc2a6556075638425e5634b07
include/libxslt/xsltutils.h: c190bd536ce0cffe1ccba74c68f7b0c9
include/libxslt/xsltwin32config.h: 8a3a4b0359659042a66603eb59cc4001
-lib/libexslt.lib: c78e77d2bc7ce733a9d45f23176f2803
-lib/libexslt_a.lib: 29b31bece1e69641372cadce020326ad
-lib/libxslt.lib: b7d9260d0f7ada29f5d3649820a8e1cb
-lib/libxslt_a.lib: e24f546f9b757fd152de506c2d3af1bf \ No newline at end of file
+lib/libexslt.lib: 0c9f94aeea183a48ec62d6e1a3ac42af
+lib/libexslt_a.lib: 026a42ff0b36660c1bd4890b656c80ee
+lib/libxslt.lib: 084d078777bf34d52af7fc93a425d6b0
+lib/libxslt_a.lib: a07434cb5a40a32a17be58f71fe24976
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
new file mode 100644
index 00000000..b75fd2a6
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -0,0 +1,14 @@
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install msys which is needed for configuring openssl for Android
+
+$version = "1.0.11"
+$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
+
+$zip = "c:\users\qt\downloads\msys-$version.7z"
+$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
+$destination = "C:\msys"
+
+Download $url $url $zip
+Verify-Checksum $zip $sha1
+C:\Utils\sevenzip\7z.exe x $zip -oC:\
diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1
new file mode 100644
index 00000000..a1b656c6
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1
@@ -0,0 +1,32 @@
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# OpenSSL need to be configured from sources for Android build in windows 7
+# Msys need to be installed to target machine
+# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
+
+$version = "1.0.2j"
+$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
+$destination = "C:\Utils\openssl-android-master"
+
+Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
+Verify-Checksum $zip $sha1
+
+C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
+C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils
+Remove-Item $destination -Force -Recurse
+Rename-Item C:\Utils\openssl-$version $destination
+Remove-Item $zip
+Remove-Item C:\Utils\openssl-$version.tar
+
+set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc
+set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar
+set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr
+$env:Path = $env:Path + ";C:\msys\1.0\bin"
+
+echo "Configuring OpenSSL $version for Android..."
+cd $destination
+C:\msys\1.0\bin\bash.exe -c "perl Configure shared android"
+
+# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h