Commit b0c92bf7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

parents c92d9b6c e961ea69
......@@ -76,6 +76,11 @@ void ImportNotesJobInterface::start()
QTimer::singleShot(0, this, &ImportNotesJobInterface::slotNextStep);
}
bool ImportNotesJobInterface::isAConfigFile(const QString &name) const
{
return name.endsWith(QLatin1String("rc")) && (name.contains(QLatin1String("akonadi_akonotes_resource_")));
}
void ImportNotesJobInterface::restoreConfig()
{
increaseProgressDialog();
......
......@@ -37,6 +37,7 @@ protected:
virtual void synchronizeResource(const QStringList &lst) = 0;
void slotNextStep() override;
private:
Q_REQUIRED_RESULT bool isAConfigFile(const QString &name) const override;
void importKNoteGlobalSettings(const KArchiveFile *kmailsnippet, const QString &kmail2rc, const QString &filename, const QString &prefix);
void restoreConfig();
void restoreData();
......
......@@ -31,7 +31,7 @@ struct ResourceFiles {
QString akonadiAgentConfigFile;
void debug() const
{
qCDebug(PIMDATAEXPORTERCORE_LOG) << " akonadiconfigfile :" << akonadiConfigFile << " akonadiResources:" << akonadiResources << " akonadiAgentConfigFile:" << akonadiAgentConfigFile;
qDebug() << " akonadiconfigfile :" << akonadiConfigFile << " akonadiResources:" << akonadiResources << " akonadiAgentConfigFile:" << akonadiAgentConfigFile;
}
};
......
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