From d72437075f60443df2cf7c38cfbe4e27cd7cf6d1 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 9 Sep 2016 12:30:30 +0200 Subject: [PATCH 1/3] GIT_SILENT: Prepare 5.3.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 127458c..37db7ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(PIM_VERSION "5.3.1") +set(PIM_VERSION "5.3.2") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADIMIME_LIB_VERSION "5.3.1") set(MESSAGELIB_LIB_VERSION "5.3.1") From 1b03920b728a8c42c40f1ad6924a49a047568360 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 9 Sep 2016 17:09:54 +0200 Subject: [PATCH 2/3] GIT_SILENT: Prepare 5.3.2. --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37db7ff..a02f295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,17 +20,17 @@ include(ECMAddTests) set(PIM_VERSION "5.3.2") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.3.1") -set(MESSAGELIB_LIB_VERSION "5.3.1") +set(AKONADIMIME_LIB_VERSION "5.3.2") +set(MESSAGELIB_LIB_VERSION "5.3.2") set(QT_REQUIRED_VERSION "5.5.0") -set(KMIME_LIB_VERSION "5.3.1") -set(KMAILTRANSPORT_LIB_VERSION "5.3.1") -set(KLDAP_LIB_VERSION "5.3.1") -set(MAILIMPORTER_LIB_VERSION "5.3.1") -set(LIBKDEPIM_LIB_VERSION "5.3.1") -set(PIMCOMMON_LIB_VERSION "5.3.1") - -set(AKONADI_VERSION "5.3.1") +set(KMIME_LIB_VERSION "5.3.2") +set(KMAILTRANSPORT_LIB_VERSION "5.3.2") +set(KLDAP_LIB_VERSION "5.3.2") +set(MAILIMPORTER_LIB_VERSION "5.3.2") +set(LIBKDEPIM_LIB_VERSION "5.3.2") +set(PIMCOMMON_LIB_VERSION "5.3.2") + +set(AKONADI_VERSION "5.3.2") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 2cc7f743cc28a32604a934605c588932bdbd164e Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 6 Oct 2016 13:30:55 +0200 Subject: [PATCH 3/3] Fix Bug 370184 - Existing Filter search value field gets deleted when clicking on it FIXED-IN: 5.3.2 BUG: 370184 --- src/search/widgethandler/headersrulerwidgethandler.cpp | 4 ++++ src/search/widgethandler/messagerulewidgethandler.cpp | 4 ++++ src/search/widgethandler/tagrulewidgethandler.cpp | 4 ++++ src/search/widgethandler/textrulerwidgethandler.cpp | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/search/widgethandler/headersrulerwidgethandler.cpp b/src/search/widgethandler/headersrulerwidgethandler.cpp index 0caf8b9..50ecb44 100644 --- a/src/search/widgethandler/headersrulerwidgethandler.cpp +++ b/src/search/widgethandler/headersrulerwidgethandler.cpp @@ -211,6 +211,8 @@ void HeadersRuleWidgetHandler::reset(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->clear(); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } @@ -266,6 +268,8 @@ bool HeadersRuleWidgetHandler::setRule(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->setText(rule->contents()); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } } diff --git a/src/search/widgethandler/messagerulewidgethandler.cpp b/src/search/widgethandler/messagerulewidgethandler.cpp index a4e9600..eeaeaea 100644 --- a/src/search/widgethandler/messagerulewidgethandler.cpp +++ b/src/search/widgethandler/messagerulewidgethandler.cpp @@ -201,6 +201,8 @@ void MessageRuleWidgetHandler::reset(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->clear(); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } } @@ -255,6 +257,8 @@ bool MessageRuleWidgetHandler::setRule(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->setText(rule->contents()); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } } diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp index a3a5523..557f620 100644 --- a/src/search/widgethandler/tagrulewidgethandler.cpp +++ b/src/search/widgethandler/tagrulewidgethandler.cpp @@ -264,6 +264,8 @@ void TagRuleWidgetHandler::reset(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->clear(); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } @@ -326,6 +328,8 @@ bool TagRuleWidgetHandler::setRule(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->setText(rule->contents()); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } } else { diff --git a/src/search/widgethandler/textrulerwidgethandler.cpp b/src/search/widgethandler/textrulerwidgethandler.cpp index 6b19c9c..2bd93db 100644 --- a/src/search/widgethandler/textrulerwidgethandler.cpp +++ b/src/search/widgethandler/textrulerwidgethandler.cpp @@ -183,6 +183,8 @@ void TextRuleWidgetHandler::reset(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->clear(); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } } @@ -225,6 +227,8 @@ bool TextRuleWidgetHandler::setRule(QStackedWidget *functionStack, lineEdit->blockSignals(true); lineEdit->setText(rule->contents()); lineEdit->blockSignals(false); + lineEdit->setClearButtonEnabled(false); + lineEdit->setClearButtonEnabled(true); valueStack->setCurrentWidget(lineEdit); } return true;