erge remote-tracking branch 'origin/Applications/17.08'

CMakeLists.txt

@@ -39,7 +39,6 @@ if(DEFINED KDEPIM_DEV_VERSION)
     set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
-
 set(KDEPIM_VERSION_NUMBER "5.6.40")
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 

core/calendar/exportcalendarjob.cpp

@@ -157,6 +157,7 @@ void ExportCalendarJob::backupConfig()
 
     backupConfigFile(QStringLiteral("calendar_printing.rc"));
     backupConfigFile(QStringLiteral("korgacrc"));
+    backupConfigFile(QStringLiteral("eventviewsrc"));
 
     const QString freebusyurlsStr(QStringLiteral("korganizer/freebusyurls"));
     const QString freebusyurls = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + freebusyurlsStr;

core/calendar/importcalendarjob.cpp

@@ -270,6 +270,7 @@ void ImportCalendarJob::restoreConfig()
     restoreUiRcFile(QStringLiteral("korganizerui.rc"), QStringLiteral("korganizer"));
     restoreUiRcFile(QStringLiteral("korganizer_part.rc"), QStringLiteral("korganizer"));
 
+    restoreConfigFile(QStringLiteral("eventviewsrc"));
     Q_EMIT info(i18n("Config restored."));
     QTimer::singleShot(0, this, &ImportCalendarJob::slotNextStep);
 }

gui/backup-structure.txt

-2016-12-28:
+2017-08-18:
 -----------
 
 2015-1-29: New VERSION for archive => VERSION_2 => knote-akonadi
@@ -112,6 +112,7 @@ Root
 |       |---------akonadiconsoleui.rc
 |       |---------foldermailarchiverc
 |       |---------pimpluginsrc
+|       |---------eventviewsrc
 |
 |-----akonadi
 |       |---------<archive akonadi>