Merge branch 'sync_with_upstream' into 'master'

Rebase to upstream and drop merged patch. Fixes JB#43135 See merge request mer-core/messagingframework!19
sailfishos · Oct 2, 2018 · a5a71f1 · a5a71f1
2 parents 97cb7f1 + d936459
commit a5a71f1
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 306 deletions.
diff --git a/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch b/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch
@@ -1,7 +1,7 @@
-From 41b5c72eac16e52509783b97add23e51f81203d7 Mon Sep 17 00:00:00 2001
+From 14476c4887a4e47ca7135749cf3acc218d7bd5cb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
 Date: Mon, 23 Feb 2015 13:08:24 +0200
-Subject: [PATCH 01/20] Stop _incomingDataTimer when imapprotocol object is
+Subject: [PATCH 01/19] Stop _incomingDataTimer when imapprotocol object is
  destroyed.
 
 A crash occurs in case the timer is active and the object is destroyed.

diff --git a/...UntrustedCertificates-configuration.patch → ...UntrustedCertificates-configuration.patch b/...UntrustedCertificates-configuration.patch → ...UntrustedCertificates-configuration.patch
@@ -1,7 +1,7 @@
-From 9d25c07bcfa9b1a706c6749711b20a9f14bfb2fd Mon Sep 17 00:00:00 2001
+From 978bc8b258fb36cb517a1db4c873033cdf56e718 Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Mon, 13 Aug 2018 15:45:24 +0300
-Subject: [PATCH 03/20] Introduce acceptUntrustedCertificates() configuration.
+Subject: [PATCH 02/19] Introduce acceptUntrustedCertificates() configuration.
 
 ---
  src/libraries/qmfclient/qmailserviceaction.h  |  2 ++

diff --git a/rpm/0002-Use-QTextDocument-to-parse-html.patch b/rpm/0002-Use-QTextDocument-to-parse-html.patch
diff --git a/rpm/0004-fix-tests-installation-path.patch → rpm/0003-fix-tests-installation-path.patch b/rpm/0004-fix-tests-installation-path.patch → rpm/0003-fix-tests-installation-path.patch
@@ -1,7 +1,7 @@
-From 7f938de0c58908f64bed0bb222f203df8670a38b Mon Sep 17 00:00:00 2001
+From 28ca7ccd92627207196b76babfe04b064bc2da18 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Tue, 30 Apr 2013 14:38:17 +0300
-Subject: [PATCH 04/20] fix tests installation path.
+Subject: [PATCH 03/19] fix tests installation path.
 
 ---
  .../tst_messageserver/tst_messageserver.pro   |   2 +-