From 738c1a935d3dfdeb9f38caa239774f2d48081f9a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 10 Jul 2021 19:11:00 +0200 Subject: [PATCH 1/2] GIT_SILENT: prepare 5.17.80beta (I didn't know that release 21.08 was created... --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a84f1d..692c3f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,18 +26,18 @@ include(ECMAddTests) set(QT_REQUIRED_VERSION "5.15.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.17.40") -set(AKONADICONTACT_LIB_VERSION "5.17.40") -set(MESSAGELIB_LIB_VERSION "5.17.40") -set(KMIME_LIB_VERSION "5.17.40") -set(KMAILTRANSPORT_LIB_VERSION "5.17.40") -set(MAILIMPORTER_LIB_VERSION "5.17.40") -set(LIBKDEPIM_LIB_VERSION "5.17.40") -set(PIMCOMMON_LIB_VERSION "5.17.40") -set(GRANTLEETHEME_LIB_VERSION "5.17.40") +set(AKONADIMIME_LIB_VERSION "5.17.80") +set(AKONADICONTACT_LIB_VERSION "5.17.80") +set(MESSAGELIB_LIB_VERSION "5.17.80") +set(KMIME_LIB_VERSION "5.17.80") +set(KMAILTRANSPORT_LIB_VERSION "5.17.80") +set(MAILIMPORTER_LIB_VERSION "5.17.80") +set(LIBKDEPIM_LIB_VERSION "5.17.80") +set(PIMCOMMON_LIB_VERSION "5.17.80") +set(GRANTLEETHEME_LIB_VERSION "5.17.80") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.17.40") +set(AKONADI_VERSION "5.17.80") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From f5cc7697eb2419c90a6f8660738855a850011085 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 14 Jul 2021 19:08:40 +0200 Subject: [PATCH 2/2] Make sure that we don't cancel dialog --- src/folder/folderselectiondialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp index b95f4ea..5af34df 100644 --- a/src/folder/folderselectiondialog.cpp +++ b/src/folder/folderselectiondialog.cpp @@ -180,9 +180,10 @@ void FolderSelectionDialog::slotAddChildFolder() { Akonadi::Collection parentCol; if (canCreateCollection(parentCol)) { - const QString name = QInputDialog::getText(this, i18nc("@title:window", "New Folder"), i18nc("@label:textbox, name of a thing", "Name")); + bool ok = false; + const QString name = QInputDialog::getText(this, i18nc("@title:window", "New Folder"), i18nc("@label:textbox, name of a thing", "Name"), {}, {}, &ok); - if (name.isEmpty()) { + if (name.isEmpty() || !ok) { return; }