Commit c4374d1e authored by Laurent Montel's avatar Laurent Montel 😁

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

parents e1a0c3d5 2ad50c92
...@@ -39,7 +39,6 @@ if(DEFINED KDEPIM_DEV_VERSION) ...@@ -39,7 +39,6 @@ if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif() endif()
set(KDEPIM_VERSION_NUMBER "5.6.40") set(KDEPIM_VERSION_NUMBER "5.6.40")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
......
...@@ -157,6 +157,7 @@ void ExportCalendarJob::backupConfig() ...@@ -157,6 +157,7 @@ void ExportCalendarJob::backupConfig()
backupConfigFile(QStringLiteral("calendar_printing.rc")); backupConfigFile(QStringLiteral("calendar_printing.rc"));
backupConfigFile(QStringLiteral("korgacrc")); backupConfigFile(QStringLiteral("korgacrc"));
backupConfigFile(QStringLiteral("eventviewsrc"));
const QString freebusyurlsStr(QStringLiteral("korganizer/freebusyurls")); const QString freebusyurlsStr(QStringLiteral("korganizer/freebusyurls"));
const QString freebusyurls = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + freebusyurlsStr; const QString freebusyurls = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + freebusyurlsStr;
......
...@@ -270,6 +270,7 @@ void ImportCalendarJob::restoreConfig() ...@@ -270,6 +270,7 @@ void ImportCalendarJob::restoreConfig()
restoreUiRcFile(QStringLiteral("korganizerui.rc"), QStringLiteral("korganizer")); restoreUiRcFile(QStringLiteral("korganizerui.rc"), QStringLiteral("korganizer"));
restoreUiRcFile(QStringLiteral("korganizer_part.rc"), QStringLiteral("korganizer")); restoreUiRcFile(QStringLiteral("korganizer_part.rc"), QStringLiteral("korganizer"));
restoreConfigFile(QStringLiteral("eventviewsrc"));
Q_EMIT info(i18n("Config restored.")); Q_EMIT info(i18n("Config restored."));
QTimer::singleShot(0, this, &ImportCalendarJob::slotNextStep); QTimer::singleShot(0, this, &ImportCalendarJob::slotNextStep);
} }
......
2016-12-28: 2017-08-18:
----------- -----------
2015-1-29: New VERSION for archive => VERSION_2 => knote-akonadi 2015-1-29: New VERSION for archive => VERSION_2 => knote-akonadi
...@@ -112,6 +112,7 @@ Root ...@@ -112,6 +112,7 @@ Root
| |---------akonadiconsoleui.rc | |---------akonadiconsoleui.rc
| |---------foldermailarchiverc | |---------foldermailarchiverc
| |---------pimpluginsrc | |---------pimpluginsrc
| |---------eventviewsrc
| |
|-----akonadi |-----akonadi
| |---------<archive akonadi> | |---------<archive akonadi>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment