From e9120bc9e615e2255ff87e66df438fb74008581b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Aug 2019 09:27:45 +0200 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index a80dff4c7..6ef1ca613 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -3,6 +3,7 @@ Name=KMail Refresh Settings Name[ca]=Actualització dels ajustaments del KMail Name[de]=Erneuerung der Einstellungen für KMail Name[en_GB]=KMail Refresh Settings +Name[es]=Preferencias de refresco de KMail Name[fi]=KMailin asetusten virkistys Name[fr]=Rafraîchissement des paramètres de KMail Name[gl]=Configuración de actualización de KMail @@ -23,6 +24,7 @@ GenericName=KMail refresh settings GenericName[ca]=Actualització dels ajustaments del KMail GenericName[de]=Erneuerung der Einstellungen für KMail GenericName[en_GB]=KMail refresh settings +GenericName[es]=Preferencias de refresco de KMail GenericName[fi]=KMailin asetusten virkistys GenericName[fr]=Rafraîchissement des paramètres de KMail GenericName[gl]=Configuración de actualización de KMail @@ -39,6 +41,7 @@ Comment=Refresh KMail settings Comment[ca]=Actualitza els ajustaments del KMail Comment[de]=Erneuerung der Einstellungen für KMail Comment[en_GB]=Refresh KMail settings +Comment[es]=Refrescar preferencias de KMail Comment[fi]=Virkistä KMail-asetukset Comment[fr]=Rafraîchir les paramètres de KMail Comment[gl]=Configuración de actualización de KMail From 532bd40758416883ea65d0c9a855784cb955d1b4 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 7 Sep 2019 14:05:16 +0200 Subject: [PATCH 2/3] GIT_SILENT: Prepare 5.12.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e24e04b85..e72c88365 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.12.1") +set(KDEPIM_VERSION_NUMBER "5.12.2") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From 671da7dec6b360cf0c53a02bb53dd327cac81367 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 9 Sep 2019 14:00:36 +0200 Subject: [PATCH 3/3] Fix compilation with Qt 5.14 - no deprecated methods usage - Qt now defined std::hash(QString) --- agents/unifiedmailboxagent/utils.h | 2 ++ src/kmkernel.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/agents/unifiedmailboxagent/utils.h b/agents/unifiedmailboxagent/utils.h index 80f8713e1..5512b2605 100644 --- a/agents/unifiedmailboxagent/utils.h +++ b/agents/unifiedmailboxagent/utils.h @@ -53,6 +53,7 @@ inline QSet listToSet(QList &&list) return rv; } +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) namespace std { template<> struct hash { @@ -62,5 +63,6 @@ struct hash { } }; } +#endif #endif diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp index 96daa4137..9c2520f0a 100644 --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -399,31 +399,31 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args for (int i = 0; i < values.count(); ++i) { const QPair element = values.at(i); const QString key = element.first.toLower(); - if (key == QLatin1Literal("to")) { + if (key == QLatin1String("to")) { if (!element.second.isEmpty()) { to += element.second + QStringLiteral(", "); } previousKey.clear(); - } else if (key == QLatin1Literal("cc")) { + } else if (key == QLatin1String("cc")) { if (!element.second.isEmpty()) { cc += element.second + QStringLiteral(", "); } previousKey.clear(); - } else if (key == QLatin1Literal("bcc")) { + } else if (key == QLatin1String("bcc")) { if (!element.second.isEmpty()) { bcc += element.second + QStringLiteral(", "); } previousKey.clear(); - } else if (key == QLatin1Literal("subject")) { + } else if (key == QLatin1String("subject")) { subj = element.second; previousKey.clear(); - } else if (key == QLatin1Literal("body")) { + } else if (key == QLatin1String("body")) { body = element.second; previousKey = key; - } else if (key == QLatin1Literal("in-reply-to")) { + } else if (key == QLatin1String("in-reply-to")) { inReplyTo = element.second; previousKey.clear(); - } else if (key == QLatin1Literal("attachment") || key == QLatin1Literal("attach")) { + } else if (key == QLatin1String("attachment") || key == QLatin1String("attach")) { if (!element.second.isEmpty()) { attachURLs << makeAbsoluteUrl(element.second, workingDir); } @@ -433,7 +433,7 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args //Workaround: https://bugs.kde.org/show_bug.cgi?id=390939 //QMap parseMailtoUrl(const QUrl &url) parses correctly url //But if we have a "&" unknown key we lost it. - if (previousKey == QLatin1Literal("body")) { + if (previousKey == QLatin1String("body")) { body += QLatin1Char('&') + key + QLatin1Char('=') + element.second; } //Don't clear previous key.