Allow to hide menu in header view

CMakeLists.txt

 cmake_minimum_required(VERSION 3.5)
-set(PIM_VERSION "5.15.41")
+set(PIM_VERSION "5.15.42")
 
 project(mailcommon VERSION ${PIM_VERSION})
 

src/folder/foldertreeview.cpp

@@ -116,7 +116,7 @@ void FolderTreeView::readConfig()
 {
     KConfigGroup myGroup(KernelIf->config(), "MainFolderView");
     int iIconSize = myGroup.readEntry("IconSize", iconSize().width());
-    if (iIconSize < 16 || iIconSize > 32) {
+    if ((iIconSize < 16) || (iIconSize > 32)) {
         iIconSize = 22;
     }
     setIconSize(QSize(iIconSize, iIconSize));

src/folder/foldertreewidget.cpp

@@ -50,6 +50,7 @@
 #include <QLabel>
 #include <QPointer>
 #include <QVBoxLayout>
+#include <QHeaderView>
 
 namespace MailCommon {
 class Q_DECL_HIDDEN FolderTreeWidget::FolderTreeWidgetPrivate
@@ -103,6 +104,9 @@ FolderTreeWidget::FolderTreeWidget(
         d->filterModel = new Akonadi::StatisticsProxyModel(this);
         d->filterModel->setSourceModel(KernelIf->collectionModel());
     }
+    if (options & HideHeaderViewMenu) {
+        d->folderTreeView->header()->setContextMenuPolicy(Qt::NoContextMenu);
+    }
 
     d->readableproxy = new FolderTreeWidgetProxyModel(this, optReadableProxy);
     d->readableproxy->setSourceModel((options & HideStatistics)

src/folder/foldertreewidget.h

@@ -59,7 +59,8 @@ public:
         UseDistinctSelectionModel = 4,
         ShowCollectionStatisticAnimation = 8,
         DontKeyFilter = 16,
-        HideStatistics = 32
+        HideStatistics = 32,
+        HideHeaderViewMenu = 64
     };
     Q_DECLARE_FLAGS(TreeViewOptions, TreeViewOption)