From cdbcd7eafc6b90bcabb17a5972df4198b575f768 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 20 Jul 2020 07:13:31 +0200 Subject: [PATCH 1/7] GIT_SILENT: prepare 5.15.0 RC --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b78958..b4424ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.80") +set(PIM_VERSION "5.14.90") project(mailcommon VERSION ${PIM_VERSION}) From 5902129025936de189044c270a4a59ec58393e44 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 22 Jul 2020 07:43:24 +0200 Subject: [PATCH 2/7] GIT_SILENT: prepare 5.15rc --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4424ca..293aa34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,17 +29,17 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.13.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.14.80") -set(AKONADICONTACT_LIB_VERSION "5.14.80") -set(MESSAGELIB_LIB_VERSION "5.14.80") -set(KMIME_LIB_VERSION "5.14.80") -set(KMAILTRANSPORT_LIB_VERSION "5.14.80") -set(MAILIMPORTER_LIB_VERSION "5.14.80") -set(LIBKDEPIM_LIB_VERSION "5.14.80") -set(PIMCOMMON_LIB_VERSION "5.14.80") +set(AKONADIMIME_LIB_VERSION "5.14.90") +set(AKONADICONTACT_LIB_VERSION "5.14.90") +set(MESSAGELIB_LIB_VERSION "5.14.90") +set(KMIME_LIB_VERSION "5.14.90") +set(KMAILTRANSPORT_LIB_VERSION "5.14.90") +set(MAILIMPORTER_LIB_VERSION "5.14.90") +set(LIBKDEPIM_LIB_VERSION "5.14.90") +set(PIMCOMMON_LIB_VERSION "5.14.90") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.14.80") +set(AKONADI_VERSION "5.14.90") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 664a4b0817eeb8ea5fa950c2e4553b37903f1ed3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 2 Aug 2020 10:17:34 +0200 Subject: [PATCH 3/7] GIT_SILENT: prepare 5.15.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 293aa34..0357a50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.90") +set(PIM_VERSION "5.15.0") project(mailcommon VERSION ${PIM_VERSION}) From c8c773287fde638cccba831a25e644b265897694 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 3 Aug 2020 07:08:31 +0200 Subject: [PATCH 4/7] GIT_SILENT: prepare 5.15.0 --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0357a50..98136b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,17 +29,17 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.13.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.14.90") -set(AKONADICONTACT_LIB_VERSION "5.14.90") -set(MESSAGELIB_LIB_VERSION "5.14.90") -set(KMIME_LIB_VERSION "5.14.90") -set(KMAILTRANSPORT_LIB_VERSION "5.14.90") -set(MAILIMPORTER_LIB_VERSION "5.14.90") -set(LIBKDEPIM_LIB_VERSION "5.14.90") -set(PIMCOMMON_LIB_VERSION "5.14.90") +set(AKONADIMIME_LIB_VERSION "5.15.0") +set(AKONADICONTACT_LIB_VERSION "5.15.0") +set(MESSAGELIB_LIB_VERSION "5.15.0") +set(KMIME_LIB_VERSION "5.15.0") +set(KMAILTRANSPORT_LIB_VERSION "5.15.0") +set(MAILIMPORTER_LIB_VERSION "5.15.0") +set(LIBKDEPIM_LIB_VERSION "5.15.0") +set(PIMCOMMON_LIB_VERSION "5.15.0") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.14.90") +set(AKONADI_VERSION "5.15.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From a990364b389dd4f3d24e7c0efe3d7508ffeb2a59 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 22 Aug 2020 13:06:15 +0200 Subject: [PATCH 5/7] GIT_SILENT: prepare 5.15.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98136b2..115786d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.0") +set(PIM_VERSION "5.15.1") project(mailcommon VERSION ${PIM_VERSION}) From e44b97b8f7a23714499c0e2a47c053cfffa4abf2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 27 Aug 2020 07:40:58 +0200 Subject: [PATCH 6/7] GIT_SILENT: prepare 5.15.1 --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 115786d..9ff1d64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,17 +29,17 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.13.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.15.0") -set(AKONADICONTACT_LIB_VERSION "5.15.0") -set(MESSAGELIB_LIB_VERSION "5.15.0") -set(KMIME_LIB_VERSION "5.15.0") -set(KMAILTRANSPORT_LIB_VERSION "5.15.0") -set(MAILIMPORTER_LIB_VERSION "5.15.0") -set(LIBKDEPIM_LIB_VERSION "5.15.0") -set(PIMCOMMON_LIB_VERSION "5.15.0") +set(AKONADIMIME_LIB_VERSION "5.15.1") +set(AKONADICONTACT_LIB_VERSION "5.15.1") +set(MESSAGELIB_LIB_VERSION "5.15.1") +set(KMIME_LIB_VERSION "5.15.1") +set(KMAILTRANSPORT_LIB_VERSION "5.15.1") +set(MAILIMPORTER_LIB_VERSION "5.15.1") +set(LIBKDEPIM_LIB_VERSION "5.15.1") +set(PIMCOMMON_LIB_VERSION "5.15.1") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.15.0") +set(AKONADI_VERSION "5.15.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From 02d9b70249eebcb68324c36135fd79ca321f2264 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 31 Aug 2020 13:49:39 +0200 Subject: [PATCH 7/7] use no deprecated enum Qt::MiddleButton --- src/folder/foldertreeview.cpp | 2 +- src/widgets/favoritecollectionwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/folder/foldertreeview.cpp b/src/folder/foldertreeview.cpp index 2fdb2e2..4c76c3f 100644 --- a/src/folder/foldertreeview.cpp +++ b/src/folder/foldertreeview.cpp @@ -577,7 +577,7 @@ Akonadi::Collection FolderTreeView::currentFolder() const void FolderTreeView::mousePressEvent(QMouseEvent *e) { - const bool buttonPressedIsMiddle = (e->button() == Qt::MidButton); + const bool buttonPressedIsMiddle = (e->button() == Qt::MiddleButton); Q_EMIT newTabRequested(buttonPressedIsMiddle); EntityTreeView::mousePressEvent(e); } diff --git a/src/widgets/favoritecollectionwidget.cpp b/src/widgets/favoritecollectionwidget.cpp index 7ef702d..4f77e34 100644 --- a/src/widgets/favoritecollectionwidget.cpp +++ b/src/widgets/favoritecollectionwidget.cpp @@ -75,7 +75,7 @@ FavoriteCollectionWidget::~FavoriteCollectionWidget() void FavoriteCollectionWidget::mousePressEvent(QMouseEvent *e) { - const bool buttonPressedIsMiddle = (e->button() == Qt::MidButton); + const bool buttonPressedIsMiddle = (e->button() == Qt::MiddleButton); Q_EMIT newTabRequested(buttonPressedIsMiddle); Akonadi::EntityListView::mousePressEvent(e); }