Commit 6b890348 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: time to increase dependancy

parent 9315d47d
Pipeline #31346 passed with stage
in 45 minutes and 6 seconds
......@@ -9,7 +9,7 @@ include(CheckIncludeFiles)
if (POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif()
set(KF5_MIN_VERSION "5.72.0")
set(KF5_MIN_VERSION "5.73.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......
......@@ -76,13 +76,7 @@
#include <followupreminder.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 <Libkleo/KeySelectionDialog>
#include <Libkleo/ProgressDialog>
......@@ -2782,13 +2776,7 @@ void KMComposerWin::applyComposerSetting(MessageComposer::ComposerViewBase *mCom
void KMComposerWin::doDelayedSend(MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn)
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
applyComposerSetting(mComposerBase);
if (mForceDisableHtml) {
disableHtml(MessageComposer::ComposerViewBase::NoConfirmationNeeded);
......
......@@ -97,14 +97,7 @@
#include <Libkdepim/ProgressManager>
#include <PimCommon/BroadcastStatus>
#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 <gpgme++/error.h>
......@@ -847,13 +840,7 @@ KMReplyCommand::KMReplyCommand(QWidget *parent, const Akonadi::Item &msg, Messag
KMCommand::Result KMReplyCommand::execute()
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
Akonadi::Item item = retrievedMessage();
KMime::Message::Ptr msg = MessageComposer::Util::message(item);
if (!msg) {
......@@ -913,13 +900,7 @@ KMCommand::Result KMForwardCommand::createComposer(const Akonadi::Item &item)
if (!msg) {
return Failed;
}
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
CreateForwardMessageJobSettings settings;
settings.item = item;
......@@ -1332,13 +1313,7 @@ KMFilterActionCommand::KMFilterActionCommand(QWidget *parent, const QVector<qlon
KMCommand::Result KMFilterActionCommand::execute()
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
int msgCount = 0;
const int msgCountToFilter = mMsgListId.count();
ProgressItem *progressItem
......@@ -1527,13 +1502,7 @@ void KMMoveCommand::slotMoveResult(KJob *job)
KMCommand::Result KMMoveCommand::execute()
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
setEmitsCompletedItself(true);
setDeletesItself(true);
Akonadi::Item::List retrievedList = retrievedMsgs();
......@@ -1659,13 +1628,7 @@ Akonadi::Collection KMTrashMsgCommand::findTrashFolder(const Akonadi::Collection
KMCommand::Result KMTrashMsgCommand::execute()
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
setEmitsCompletedItself(true);
setDeletesItself(true);
for (auto trashIt = mTrashFolders.begin(), end = mTrashFolders.end(); trashIt != end; ++trashIt) {
......
......@@ -77,14 +77,7 @@
#include <MessageViewer/AttachmentStrategy>
#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 <MessageComposer/MessageSender>
#include <MessageComposer/MessageHelper>
......@@ -516,13 +509,7 @@ void KMMainWidget::folderSelected(const Akonadi::Collection &col)
}
mGoToFirstUnreadMessageInSelectedFolder = false;
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
if (mMsgView) {
mMsgView->clear(true);
......@@ -1481,13 +1468,7 @@ void KMMainWidget::slotEmptyFolder()
!= KMessageBox::Continue) {
return;
}
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
slotSelectAllMessages();
if (isTrash) {
/* Don't ask for confirmation again when deleting, the user has already
......@@ -2251,38 +2232,20 @@ void KMMainWidget::slotApplyFilterOnFolder(bool recursive)
void KMMainWidget::applyFilters(const Akonadi::Item::List &selectedMessages)
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
MailCommon::FilterManager::instance()->filter(selectedMessages);
}
void KMMainWidget::applyFilters(const Akonadi::Collection::List &selectedCols)
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
MailCommon::FilterManager::instance()->filter(selectedCols);
}
void KMMainWidget::applyFilter(const Akonadi::Collection::List &selectedCols, const QString &filter)
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
MailCommon::FilterManager::instance()->filter(selectedCols, { filter });
}
......@@ -3679,25 +3642,13 @@ void KMMainWidget::slotCollapseThread()
void KMMainWidget::slotExpandAllThreads()
{
// TODO: Make this asynchronous ? (if there is enough demand)
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
mMessagePane->setAllThreadsExpanded(true);
}
void KMMainWidget::slotCollapseAllThreads()
{
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
#endif
#else
KCursorSaver saver(Qt::WaitCursor);
#endif
mMessagePane->setAllThreadsExpanded(false);
}
......
Supports Markdown
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