Merge remote-tracking branch 'origin/5.13' into 5.13.1

Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2

4 files changed, 16 insertions, 60 deletions

diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt
new file mode 100644
index 00000000..6b51b7b6
--- /dev/null
+++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt
@@ -0,0 +1,7 @@
+1563296424
+FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f
+LICENSE: 1ac8330e79e050867144e174d80880f7
+conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d
+export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7
+export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7
+export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt
new file mode 100644
index 00000000..45447d86
--- /dev/null
+++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt
@@ -0,0 +1,9 @@
+1563296480
+FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f
+conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb
+include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda
+include/zlib.h: 0338828e9d00c94645648b1517108324
+lib/libzlib.a: 5dc51a25ecef8f9c97e6b67cec736634
+lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99
+licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e
+zlib.pc: 29adeed07108745c3562dc19343f3d99
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
deleted file mode 100644
index d7806e94..00000000
--- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-1479836260
-CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81
-FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56
-conanfile.py: e8de244463aa84c51238f1fd22a1ae00
\ No newline at end of file
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
deleted file mode 100644
index 88b5c152..00000000
--- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-1479836298
-FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56
-conaninfo.txt: e2f8774ada0606cca4800e6f6987394e
-include/blast.h: fa67f1dd7e681b188546423884fe25ec
-include/crc32.h: f28d16b67efecdfafa0d816a7d982124
-include/crypt.h: 6e72c46776f0db175ec8f15144a3c250
-include/deflate.h: 7ceae74a13201f14c91623116af169c3
-include/gzguts.h: b337a2af7b4c7af157b1b2a9dd64c0f8
-include/gzlog.h: 7d497747a90370d3b13320bbf97e65dc
-include/infback9.h: 52b1ed99960d3ed7ed60cd20295e64a8
-include/inffast.h: f3669099d3f571dbc0426401ed5f50e3
-include/inffix9.h: 1558f49aeca6376b7aa331add59e0e06
-include/inffixed.h: 7fa3e91804601b6618c915b76a8dc332
-include/inflate.h: 8f1b05cdf36a269882a955071b140162
-include/inflate9.h: 8a4de1bca6c4182d025ea55062d125d9
-include/inftree9.h: be5cf855a19b76feb28468e5b46145b7
-include/inftrees.h: ec87be89b9bcca8ced80a70f857e823b
-include/ioapi.h: 7d6c0585719ba47fd356795801befc6d
-include/iowin32.h: 818e2950cc00d787eaa9b710007dc53f
-include/mztools.h: 7caac7503f8f002d61e0f0e5b7f33bc6
-include/puff.h: 7ecbeeb67e09a843961187673974f86d
-include/trees.h: 51fdcb3e2ccf60ca13c06920c89296a3
-include/unzip.h: 11ae6a9d654c95c47da55fe16772a1e5
-include/zconf.h: 371f055f4b9c75a473da59dfb9268f21
-include/zfstream.h: 938f58c179fabf6ff9ffb85395ada81f
-include/zip.h: e1495f151b00503a64aae7b375cc3b80
-include/zlib.h: 64d8a5180bd54ff5452886e4cbb21e14
-include/zstream.h: a980b61c1e8be68d5cdb1236ba6b43e7
-include/zutil.h: 04fcfbb961591c9452c4d0fd1525ffdf
-lib/C.includecache: 2a275573d6bdd65a8b8ef59f629c18ba
-lib/DependInfo.cmake: ae32810aa874699287b057a57bb4ebe3
-lib/adler32.obj: 628307ada6c4f583837f98a86f0cdc7a
-lib/build.make: d22b7b24b231da06fed02e9c19860d8c
-lib/cmake_clean.cmake: 02e9e0e203fb9e96f49a4136f66ae6d9
-lib/cmake_clean_target.cmake: 0d82d9dfb4e94fa1d2c8201023c801ab
-lib/compress.obj: fd3ee3b189db238906e6d8c3bc7f3785
-lib/crc32.obj: 4a4ea589d4cb9c892a9690446bded090
-lib/deflate.obj: 5c08287751273abb2649a39abd33b57c
-lib/depend.internal: 9f57661ca5d24b63b07e4b17717dbf31
-lib/depend.make: 3565852809d7357179f74379be7af651
-lib/flags.make: 15b3124297b5ec74b2f7ba7876adca3e
-lib/gzclose.obj: fa130c24a884e3db58195315eb2002e9
-lib/gzlib.obj: 100b5cdf0edf3cf759446d8a836a9e63
-lib/gzread.obj: e44720562c175dd122e99a158a87272a
-lib/gzwrite.obj: 2943d7662bee2a9367c62d5a5a84e122
-lib/includes_C.rsp: 459fa74070615e1040d5c8dfd9bd5177
-lib/infback.obj: e19339854ee788b1ac54cd97e03fde0b
-lib/inffast.obj: 067b8b689801213f6740e05405053a84
-lib/inflate.obj: a429f8ec8a73d923911f50f0153b5e42
-lib/inftrees.obj: 8a7349abf3599a7d2d5b88578fa44ac4
-lib/libzlibstatic.a: 91f1ddd318e256ffb4c526e111ed063f
-lib/link.txt: f94b96609f51147e6e09cd3143aaac07
-lib/progress.make: 20799cec453b892ad5a11033508bce80
-lib/trees.obj: a9f9d07743b1742ed4e466469581c54f
-lib/uncompr.obj: d46edd5a818878e69c138a5bde688b22
-lib/zutil.obj: d59a363a9262423a29179499e1479c45
\ No newline at end of file