Commit 427d81dd authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: time to increase dependancy

parent a0d14471
Pipeline #31309 failed with stage
in 102 minutes and 16 seconds
......@@ -12,7 +12,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
option(MESSAGEVIEWER_EXPERIMENTAL_CONVERSATIONVIEW "Experimental conversationview (in progress)" FALSE)
set(KF5_MIN_VERSION "5.72.0")
set(KF5_MIN_VERSION "5.73.0")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
......
......@@ -35,14 +35,7 @@
#include <MimeTreeParser/ObjectTreeParser>
#include <MimeTreeParser/SimpleObjectTreeSource>
#include <kguiaddons_version.h>
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
#include <Libkdepim/KCursorSaver>
#endif
#else
#include <KCursorSaver>
#endif
#include <Sonnet/DictionaryComboBox>
#include <KIdentityManagement/Identity>
......@@ -295,13 +288,7 @@ void ComposerViewBase::send(MessageComposer::MessageSender::SendMethod method, M
mSendMethod = method;
mSaveIn = saveIn;
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const KIdentityManagement::Identity identity = identityManager()->identityForUoid(m_identityCombo->currentIdentity());
if (identity.attachVcard() && m_attachmentController->attachOwnVcard()) {
......@@ -1822,13 +1809,7 @@ bool ComposerViewBase::determineWhetherToSign(bool doSignCompletely, Kleo::KeyRe
case Kleo::Ask:
{
// the user wants to be asked or has to be asked
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = i18n("Examination of the recipient's signing preferences "
"yielded that you be asked whether or not to sign "
"this message.\n"
......@@ -1856,13 +1837,7 @@ bool ComposerViewBase::determineWhetherToSign(bool doSignCompletely, Kleo::KeyRe
case Kleo::Conflict:
{
// warn the user that there are conflicting signing preferences
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = i18n("There are conflicting signing preferences "
"for these recipients.\n"
"Sign this message?");
......@@ -1888,13 +1863,7 @@ bool ComposerViewBase::determineWhetherToSign(bool doSignCompletely, Kleo::KeyRe
}
case Kleo::Impossible:
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = i18n("You have requested to sign this message, "
"but no valid signing keys have been configured "
"for this identity.");
......@@ -1913,13 +1882,7 @@ bool ComposerViewBase::determineWhetherToSign(bool doSignCompletely, Kleo::KeyRe
if (!sign || !doSignCompletely) {
if (MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsigned()) {
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = sign && !doSignCompletely
? i18n("Some parts of this message will not be signed.\n"
"Sending only partially signed messages might violate site policy.\n"
......@@ -1973,13 +1936,7 @@ bool ComposerViewBase::determineWhetherToEncrypt(bool doEncryptCompletely, Kleo:
case Kleo::Ask:
{
// the user wants to be asked or has to be asked
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = opportunistic
? i18n("Valid trusted encryption keys were found for all recipients.\n"
"Encrypt this message?")
......@@ -2014,13 +1971,7 @@ bool ComposerViewBase::determineWhetherToEncrypt(bool doEncryptCompletely, Kleo:
case Kleo::Conflict:
{
// warn the user that there are conflicting encryption preferences
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = i18n("There are conflicting encryption preferences "
"for these recipients.\n"
"Encrypt this message?");
......@@ -2046,13 +1997,7 @@ bool ComposerViewBase::determineWhetherToEncrypt(bool doEncryptCompletely, Kleo:
}
case Kleo::Impossible:
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = i18n("You have requested to encrypt this message, "
"and to encrypt a copy to yourself, "
"but no valid trusted encryption keys have been "
......@@ -2072,13 +2017,7 @@ bool ComposerViewBase::determineWhetherToEncrypt(bool doEncryptCompletely, Kleo:
if (!encrypt || !doEncryptCompletely) {
if (MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencrypted()) {
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
const QString msg = !doEncryptCompletely
? i18n("Some parts of this message will not be encrypted.\n"
"Sending only partially encrypted messages might violate "
......
......@@ -14,14 +14,7 @@
#include "composer/keyresolver.h"
#include "job/savecontactpreferencejob.h"
#include <kguiaddons_version.h>
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
#include <Libkdepim/KCursorSaver>
#endif
#else
#include <KCursorSaver>
#endif
#include "utils/kleo_util.h"
#include <KEmailAddress>
......@@ -1556,13 +1549,7 @@ Kleo::Result Kleo::KeyResolver::showKeyApprovalDialog(bool &finalySendUnencrypte
std::copy(d->mSMIMEEncryptToSelfKeys.begin(), d->mSMIMEEncryptToSelfKeys.end(),
std::back_inserter(senderKeys));
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
QPointer<Kleo::KeyApprovalDialog> dlg = new Kleo::KeyApprovalDialog(items, senderKeys);
......@@ -1644,13 +1631,7 @@ Kleo::Result Kleo::KeyResolver::showKeyApprovalDialog(bool &finalySendUnencrypte
: i18n("You did not select encryption keys for some of "
"the recipients: these persons will not be able to "
"decrypt the message if you encrypt it.");
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
if (KMessageBox::warningContinueCancel(nullptr, msg,
i18n("Missing Key Warning"),
KGuiItem(i18n("&Encrypt")))
......
......@@ -14,14 +14,7 @@
#include "MessageComposer/Util"
#include <AkonadiCore/item.h>
#include <kguiaddons_version.h>
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
#include <Libkdepim/KCursorSaver>
#endif
#else
#include <KCursorSaver>
#endif
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
......@@ -391,13 +384,7 @@ QPair< KMime::Message::Ptr, QVector< KMime::Content * > > MessageFactoryNG::crea
}
MessageHelper::setAutomaticFields(msg, true);
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
const KPIM::KCursorSaver saver(Qt::ArrowCursor);
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
if (numberOfItems == 0) {
attachments << createForwardAttachmentMessage(mOrigMsg);
MessageComposer::Util::addLinkInformation(msg, mId, Akonadi::MessageStatus::statusForwarded());
......
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