diff --git a/CMakeLists.txt b/CMakeLists.txt index efc0892..ea4775c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.46") +set(PIM_VERSION "5.15.47") project(mailcommon VERSION ${PIM_VERSION}) diff --git a/src/collectionpage/collectionexpirywidget.cpp b/src/collectionpage/collectionexpirywidget.cpp index a3fd37c..c8693e6 100644 --- a/src/collectionpage/collectionexpirywidget.cpp +++ b/src/collectionpage/collectionexpirywidget.cpp @@ -101,6 +101,11 @@ CollectionExpiryWidget::~CollectionExpiryWidget() { } +void CollectionExpiryWidget::hideExpireNowButton() +{ + expireNowPB->setVisible(false); +} + void CollectionExpiryWidget::slotChanged() { Q_EMIT configChanged(); diff --git a/src/collectionpage/collectionexpirywidget.h b/src/collectionpage/collectionexpirywidget.h index f292436..c99edbf 100644 --- a/src/collectionpage/collectionexpirywidget.h +++ b/src/collectionpage/collectionexpirywidget.h @@ -49,6 +49,7 @@ public: void save(Akonadi::Collection &collection, bool saveSettings, bool expireNow); void save(const CollectionExpirySettings &collectionExpirySettings, Akonadi::Collection &collection, bool saveSettings, bool expireNow); Q_REQUIRED_RESULT CollectionExpirySettings settings() const; + void hideExpireNowButton(); Q_SIGNALS: void saveAndExpireRequested(); void configChanged(bool changed = true);