From 6fcd8ab2f0e28a45bff0e1dde22279a37620eae2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Apr 2020 06:55:22 +0200 Subject: [PATCH 1/3] GIT_SILENT: Prepare 5.14.0 --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd60bc5..5f1e3f5 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.13.90") -set(MESSAGELIB_LIB_VERSION "5.13.90") -set(KMIME_LIB_VERSION "5.13.90") -set(KMAILTRANSPORT_LIB_VERSION "5.13.90") -set(MAILIMPORTER_LIB_VERSION "5.13.90") -set(LIBKDEPIM_LIB_VERSION "5.13.90") -set(PIMCOMMON_LIB_VERSION "5.13.90") - -set(AKONADI_VERSION "5.13.90") -set(AKONADIMIME_LIB_VERSION "5.13.90") -set(MESSAGELIB_LIB_VERSION "5.13.90") -set(KMIME_LIB_VERSION "5.13.90") -set(KMAILTRANSPORT_LIB_VERSION "5.13.90") -set(MAILIMPORTER_LIB_VERSION "5.13.90") -set(LIBKDEPIM_LIB_VERSION "5.13.90") -set(PIMCOMMON_LIB_VERSION "5.13.90") +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(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.13.90") +set(AKONADI_VERSION "5.14.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 588109f4a78ad47f4628910329bf2e7fd34605de Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Apr 2020 20:37:44 +0200 Subject: [PATCH 2/3] It's already initialize in header --- src/search/searchpatternedit.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/search/searchpatternedit.cpp b/src/search/searchpatternedit.cpp index a481f29..67ce023 100644 --- a/src/search/searchpatternedit.cpp +++ b/src/search/searchpatternedit.cpp @@ -82,9 +82,6 @@ static const int SpecialRuleFieldsCount SearchRuleWidget::SearchRuleWidget(QWidget *parent, SearchRule::Ptr aRule, SearchPatternEdit::SearchPatternEditOptions options, SearchPatternEdit::SearchModeType modeType) : QWidget(parent) - , mRuleField(nullptr) - , mFunctionStack(nullptr) - , mValueStack(nullptr) { initFieldList(options); initWidget(modeType); From c67e7be97d5074030f816e2906ed013919cddd19 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Apr 2020 20:37:56 +0200 Subject: [PATCH 3/3] Fix Bug 419720 - Message status filter broken FIXED-IN: 5.14.0 BUG: 419720 --- src/search/searchrule/searchrulestatus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search/searchrule/searchrulestatus.h b/src/search/searchrule/searchrulestatus.h index 407cffe..e332b76 100644 --- a/src/search/searchrule/searchrulestatus.h +++ b/src/search/searchrule/searchrulestatus.h @@ -27,8 +27,8 @@ namespace MailCommon { //TODO: Check if the below one is needed or not! // The below are used in several places and here so they are accessible. struct MessageStatusInfo { - const char *text; const char *context; + const char *text; const char *icon; };