From 5912f2904a4605603d0179fddc5e6a0e1f100d0f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 24 Apr 2020 07:16:27 +0200 Subject: [PATCH 1/7] GIT_SILENT: Prepare 5.14.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f1e3f5..02252c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.0") +set(PIM_VERSION "5.14.1") project(mailcommon VERSION ${PIM_VERSION}) From b1161ffb32db858c5969cc8bbbc75f21d0556662 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 30 Apr 2020 07:08:13 +0200 Subject: [PATCH 2/7] GIT_SILENT: Prepare 5.14.1 --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02252c8..1d2d298 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,24 +29,24 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.12.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.14.0") -set(MESSAGELIB_LIB_VERSION "5.14.0") -set(KMIME_LIB_VERSION "5.14.0") -set(KMAILTRANSPORT_LIB_VERSION "5.14.0") -set(MAILIMPORTER_LIB_VERSION "5.14.0") -set(LIBKDEPIM_LIB_VERSION "5.14.0") -set(PIMCOMMON_LIB_VERSION "5.14.0") - -set(AKONADI_VERSION "5.14.0") -set(AKONADIMIME_LIB_VERSION "5.14.0") -set(MESSAGELIB_LIB_VERSION "5.14.0") -set(KMIME_LIB_VERSION "5.14.0") -set(KMAILTRANSPORT_LIB_VERSION "5.14.0") -set(MAILIMPORTER_LIB_VERSION "5.14.0") -set(LIBKDEPIM_LIB_VERSION "5.14.0") -set(PIMCOMMON_LIB_VERSION "5.14.0") +set(AKONADIMIME_LIB_VERSION "5.14.1") +set(MESSAGELIB_LIB_VERSION "5.14.1") +set(KMIME_LIB_VERSION "5.14.1") +set(KMAILTRANSPORT_LIB_VERSION "5.14.1") +set(MAILIMPORTER_LIB_VERSION "5.14.1") +set(LIBKDEPIM_LIB_VERSION "5.14.1") +set(PIMCOMMON_LIB_VERSION "5.14.1") + +set(AKONADI_VERSION "5.14.1") +set(AKONADIMIME_LIB_VERSION "5.14.1") +set(MESSAGELIB_LIB_VERSION "5.14.1") +set(KMIME_LIB_VERSION "5.14.1") +set(KMAILTRANSPORT_LIB_VERSION "5.14.1") +set(MAILIMPORTER_LIB_VERSION "5.14.1") +set(LIBKDEPIM_LIB_VERSION "5.14.1") +set(PIMCOMMON_LIB_VERSION "5.14.1") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.14.0") +set(AKONADI_VERSION "5.14.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 1f3859210726bdf4796bd5dd2066b8b865ed45d8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 17 May 2020 17:31:10 +0200 Subject: [PATCH 3/7] GIT_SILENT: Prepare 5.14.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d2d298..a3b4b1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.1") +set(PIM_VERSION "5.14.2") project(mailcommon VERSION ${PIM_VERSION}) From b6863bb75a6d8f86ba3501adfa7b5427610e54fd Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 20 May 2020 21:02:43 +0200 Subject: [PATCH 4/7] GIT_SILENT: Prepare 5.14.2 --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b4b1f..207cfd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,24 +29,24 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.12.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.14.1") -set(MESSAGELIB_LIB_VERSION "5.14.1") -set(KMIME_LIB_VERSION "5.14.1") -set(KMAILTRANSPORT_LIB_VERSION "5.14.1") -set(MAILIMPORTER_LIB_VERSION "5.14.1") -set(LIBKDEPIM_LIB_VERSION "5.14.1") -set(PIMCOMMON_LIB_VERSION "5.14.1") - -set(AKONADI_VERSION "5.14.1") -set(AKONADIMIME_LIB_VERSION "5.14.1") -set(MESSAGELIB_LIB_VERSION "5.14.1") -set(KMIME_LIB_VERSION "5.14.1") -set(KMAILTRANSPORT_LIB_VERSION "5.14.1") -set(MAILIMPORTER_LIB_VERSION "5.14.1") -set(LIBKDEPIM_LIB_VERSION "5.14.1") -set(PIMCOMMON_LIB_VERSION "5.14.1") +set(AKONADIMIME_LIB_VERSION "5.14.2") +set(MESSAGELIB_LIB_VERSION "5.14.2") +set(KMIME_LIB_VERSION "5.14.2") +set(KMAILTRANSPORT_LIB_VERSION "5.14.2") +set(MAILIMPORTER_LIB_VERSION "5.14.2") +set(LIBKDEPIM_LIB_VERSION "5.14.2") +set(PIMCOMMON_LIB_VERSION "5.14.2") + +set(AKONADI_VERSION "5.14.2") +set(AKONADIMIME_LIB_VERSION "5.14.2") +set(MESSAGELIB_LIB_VERSION "5.14.2") +set(KMIME_LIB_VERSION "5.14.2") +set(KMAILTRANSPORT_LIB_VERSION "5.14.2") +set(MAILIMPORTER_LIB_VERSION "5.14.2") +set(LIBKDEPIM_LIB_VERSION "5.14.2") +set(PIMCOMMON_LIB_VERSION "5.14.2") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.14.1") +set(AKONADI_VERSION "5.14.2") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 1118df09864d917869056c25e02d02c6b08460ab Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 12 Jun 2020 08:07:06 +0200 Subject: [PATCH 5/7] GIT_SILENT: Prepare 5.14.3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 207cfd6..2b7e6f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.2") +set(PIM_VERSION "5.14.3") project(mailcommon VERSION ${PIM_VERSION}) From 980d1936349afa03ea42b71a4728eedddf001af3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 15 Jun 2020 13:36:40 +0200 Subject: [PATCH 6/7] GIT_SILENT: Prepare 5.14.3 --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b7e6f0..b6ec2b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,24 +29,24 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.12.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.14.2") -set(MESSAGELIB_LIB_VERSION "5.14.2") -set(KMIME_LIB_VERSION "5.14.2") -set(KMAILTRANSPORT_LIB_VERSION "5.14.2") -set(MAILIMPORTER_LIB_VERSION "5.14.2") -set(LIBKDEPIM_LIB_VERSION "5.14.2") -set(PIMCOMMON_LIB_VERSION "5.14.2") - -set(AKONADI_VERSION "5.14.2") -set(AKONADIMIME_LIB_VERSION "5.14.2") -set(MESSAGELIB_LIB_VERSION "5.14.2") -set(KMIME_LIB_VERSION "5.14.2") -set(KMAILTRANSPORT_LIB_VERSION "5.14.2") -set(MAILIMPORTER_LIB_VERSION "5.14.2") -set(LIBKDEPIM_LIB_VERSION "5.14.2") -set(PIMCOMMON_LIB_VERSION "5.14.2") +set(AKONADIMIME_LIB_VERSION "5.14.3") +set(MESSAGELIB_LIB_VERSION "5.14.3") +set(KMIME_LIB_VERSION "5.14.3") +set(KMAILTRANSPORT_LIB_VERSION "5.14.3") +set(MAILIMPORTER_LIB_VERSION "5.14.3") +set(LIBKDEPIM_LIB_VERSION "5.14.3") +set(PIMCOMMON_LIB_VERSION "5.14.3") + +set(AKONADI_VERSION "5.14.3") +set(AKONADIMIME_LIB_VERSION "5.14.3") +set(MESSAGELIB_LIB_VERSION "5.14.3") +set(KMIME_LIB_VERSION "5.14.3") +set(KMAILTRANSPORT_LIB_VERSION "5.14.3") +set(MAILIMPORTER_LIB_VERSION "5.14.3") +set(LIBKDEPIM_LIB_VERSION "5.14.3") +set(PIMCOMMON_LIB_VERSION "5.14.3") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.14.2") +set(AKONADI_VERSION "5.14.3") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From f761cd0a1c7d3a2bff571ca1fe205ae46ce01a5e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 24 Jun 2020 13:27:37 +0200 Subject: [PATCH 7/7] Fix mem leak found by asan --- src/filter/kmfilterdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filter/kmfilterdialog.cpp b/src/filter/kmfilterdialog.cpp index 34baa93..757aa44 100644 --- a/src/filter/kmfilterdialog.cpp +++ b/src/filter/kmfilterdialog.cpp @@ -106,7 +106,7 @@ KMFilterDialog::KMFilterDialog(const QList &actionCollectio user1Button->setText(i18n("Import...")); user2Button->setText(i18n("Export...")); user3Button->setText(i18n("Convert to...")); - QMenu *menu = new QMenu(); + QMenu *menu = new QMenu(this); QAction *act = new QAction(i18n("KMail filters"), this); act->setData(QVariant::fromValue(MailCommon::FilterImporterExporter::KMailFilter));