From 36bc86c29902186624d6a054d76cab9b5aa080ab Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 18 Mar 2020 07:07:18 +0100 Subject: [PATCH 1/2] GIT_SILENT: Prepare 5.14.0 beta1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f2dbe73e..e0f71488a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) # Do NOT add quote -set(KDEPIM_DEV_VERSION alpha) +set(KDEPIM_DEV_VERSION beta1) set(RELEASE_SERVICE_VERSION "20.03.80") # add an extra space From 45af9c260653d3a500cab3a9b60cf0b08832ead1 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 18 Mar 2020 08:33:05 +0100 Subject: [PATCH 2/2] Fix reset value --- src/configuredialog/configuremiscpage.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/configuredialog/configuremiscpage.cpp b/src/configuredialog/configuremiscpage.cpp index f2113cae1..6c9cd55c0 100644 --- a/src/configuredialog/configuremiscpage.cpp +++ b/src/configuredialog/configuremiscpage.cpp @@ -207,12 +207,16 @@ void KuserFeedBackPageTab::save() void KuserFeedBackPageTab::doResetToDefaultsOther() { - + if (KMKernel::self()) { + mUserFeedbackWidget->setFeedbackProvider(KMKernel::self()->userFeedbackProvider()); + } } void KuserFeedBackPageTab::doLoadFromGlobalSettings() { - + if (KMKernel::self()) { + mUserFeedbackWidget->setFeedbackProvider(KMKernel::self()->userFeedbackProvider()); + } }