From dc605e7616bf7ea3d52fc161c6f1f6760885c8ed Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 26 Mar 2018 06:54:15 +0200 Subject: [PATCH 1/7] GIT_SILENT: prepare 5.8rc --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee185e5..4a05e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.80") +set(PIM_VERSION "5.7.90") project(mailcommon VERSION ${PIM_VERSION}) From 82762bf6d07c18724b26cf148039c9e25303c76e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 31 Mar 2018 20:57:13 +0200 Subject: [PATCH 2/7] GIT_SILENT: prepare 5.8rc --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a05e07..e4b1cea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,16 +25,16 @@ include(ECMAddTests) include(ECMCoverageOption) set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.7.80") -set(MESSAGELIB_LIB_VERSION "5.7.80") +set(AKONADIMIME_LIB_VERSION "5.8.90") +set(MESSAGELIB_LIB_VERSION "5.8.90") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.7.80") -set(KMAILTRANSPORT_LIB_VERSION "5.7.80") -set(MAILIMPORTER_LIB_VERSION "5.7.80") -set(LIBKDEPIM_LIB_VERSION "5.7.80") -set(PIMCOMMON_LIB_VERSION "5.7.80") +set(KMIME_LIB_VERSION "5.8.90") +set(KMAILTRANSPORT_LIB_VERSION "5.8.90") +set(MAILIMPORTER_LIB_VERSION "5.8.90") +set(LIBKDEPIM_LIB_VERSION "5.8.90") +set(PIMCOMMON_LIB_VERSION "5.8.90") -set(AKONADI_VERSION "5.7.80") +set(AKONADI_VERSION "5.8.90") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From a802da1df361ac4956bf277f76f8388397556ccb Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 1 Apr 2018 12:41:39 +0200 Subject: [PATCH 3/7] GIT_SILENT: fix version --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4b1cea..65e4e29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,16 +25,16 @@ include(ECMAddTests) include(ECMCoverageOption) set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.8.90") -set(MESSAGELIB_LIB_VERSION "5.8.90") +set(AKONADIMIME_LIB_VERSION "5.7.90") +set(MESSAGELIB_LIB_VERSION "5.7.90") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.8.90") -set(KMAILTRANSPORT_LIB_VERSION "5.8.90") -set(MAILIMPORTER_LIB_VERSION "5.8.90") -set(LIBKDEPIM_LIB_VERSION "5.8.90") -set(PIMCOMMON_LIB_VERSION "5.8.90") +set(KMIME_LIB_VERSION "5.7.90") +set(KMAILTRANSPORT_LIB_VERSION "5.7.90") +set(MAILIMPORTER_LIB_VERSION "5.7.90") +set(LIBKDEPIM_LIB_VERSION "5.7.90") +set(PIMCOMMON_LIB_VERSION "5.7.90") -set(AKONADI_VERSION "5.8.90") +set(AKONADI_VERSION "5.7.90") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 3ee38e5532c450afa56b359114e7483034a29222 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 7 Apr 2018 11:13:31 +0200 Subject: [PATCH 4/7] GIT_SILENT: prepare 5.8.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65e4e29..c6f62b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.90") +set(PIM_VERSION "5.8.0") project(mailcommon VERSION ${PIM_VERSION}) From d43e5b24d4c6d67405bc2ebd627dd17a809c25b3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 10 Apr 2018 13:51:04 +0200 Subject: [PATCH 5/7] GIT_SILENT: prepare 5.8.0 --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6f62b9..fbe48cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,16 +25,16 @@ include(ECMAddTests) include(ECMCoverageOption) set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.7.90") -set(MESSAGELIB_LIB_VERSION "5.7.90") +set(AKONADIMIME_LIB_VERSION "5.8.0") +set(MESSAGELIB_LIB_VERSION "5.8.0") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.7.90") -set(KMAILTRANSPORT_LIB_VERSION "5.7.90") -set(MAILIMPORTER_LIB_VERSION "5.7.90") -set(LIBKDEPIM_LIB_VERSION "5.7.90") -set(PIMCOMMON_LIB_VERSION "5.7.90") +set(KMIME_LIB_VERSION "5.8.0") +set(KMAILTRANSPORT_LIB_VERSION "5.8.0") +set(MAILIMPORTER_LIB_VERSION "5.8.0") +set(LIBKDEPIM_LIB_VERSION "5.8.0") +set(PIMCOMMON_LIB_VERSION "5.8.0") -set(AKONADI_VERSION "5.7.90") +set(AKONADI_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 780999e46d0265d55449dc5d8299390d8ce27396 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 19 Apr 2018 13:30:34 +0200 Subject: [PATCH 6/7] GIT_SILENT: prepare 5.8.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbe48cc..65852bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.0") +set(PIM_VERSION "5.8.1") project(mailcommon VERSION ${PIM_VERSION}) From 0584cbaf40b33f068620e2f40470c76a864eae4d Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 21 Apr 2018 14:14:03 +0200 Subject: [PATCH 7/7] Remove duplicate margin --- src/filter/invalidfilters/invalidfilterdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/filter/invalidfilters/invalidfilterdialog.cpp b/src/filter/invalidfilters/invalidfilterdialog.cpp index 876961c..4fc6ad0 100644 --- a/src/filter/invalidfilters/invalidfilterdialog.cpp +++ b/src/filter/invalidfilters/invalidfilterdialog.cpp @@ -45,6 +45,7 @@ InvalidFilterDialog::InvalidFilterDialog(QWidget *parent) QWidget *w = new QWidget(this); QVBoxLayout *vbox = new QVBoxLayout; + vbox->setMargin(0); w->setLayout(vbox); mInvalidFilterWidget = new InvalidFilterWidget(this); mInvalidFilterWidget->setObjectName(QStringLiteral("invalid_filter_widget"));