Merge remote-tracking branch 'origin/release/20.04'

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

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());
+    }
 }