From 94d13094eebd234613ebbaf2cfceed41789bc483 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sun, 8 Aug 2021 17:27:35 +0200
Subject: [PATCH 1/2] GIT_SILENT: prepare 5.18.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ce4fba..cbc1bb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.18.0")
+set(PIM_VERSION "5.18.1")
 
 project(mailcommon VERSION ${PIM_VERSION})
 

From 8d0bfbda8da72f68b9c793e7d262b11b98c9076f Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Mon, 9 Aug 2021 15:48:53 +0200
Subject: [PATCH 2/2] FavoriteProxyTest: adapt test for dropping option on
 favourites

ace9cfb46008e4fcd2b973111fbc508110bbd9c9 enabled dropping of emails
on favourites, but missed to adapt the test.
---
 autotests/favoritestest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autotests/favoritestest.cpp b/autotests/favoritestest.cpp
index 8b8d018..1a43a2f 100644
--- a/autotests/favoritestest.cpp
+++ b/autotests/favoritestest.cpp
@@ -111,7 +111,8 @@ void FavoriteProxyTest::testReordering()
     const QModelIndex firstRowIndex = orderProxy->index(0, 0);
     QVERIFY(firstRowIndex.isValid());
     QCOMPARE(firstRowIndex.data().toString(), QStringLiteral("res2"));
-    QVERIFY((orderProxy->flags(firstRowIndex) & Qt::ItemIsDropEnabled) == 0);
+    // we can drop emails
+    QVERIFY((orderProxy->flags(firstRowIndex) & Qt::ItemIsDropEnabled) != 0);
 }
 
 #include "favoritestest.moc"