From 81e2e80b565fac546c601cf815fcb8b1bfff28bc Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 2 Mar 2020 21:24:19 +0100 Subject: [PATCH] Make it compile against last qt5.15 --- src/filter/filteractions/filteractionaddtoaddressbook.cpp | 4 ++++ src/snippets/snippetattachmentwidget.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp index f4b8e8b..ec68f3b 100644 --- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp +++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp @@ -249,7 +249,11 @@ QString FilterActionAddToAddressBook::argsAsString() const void FilterActionAddToAddressBook::argsFromString(const QString &argsStr) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) const QStringList parts = argsStr.split(QLatin1Char('\t'), QString::KeepEmptyParts); +#else + const QStringList parts = argsStr.split(QLatin1Char('\t'), Qt::KeepEmptyParts); +#endif const QString firstElement = parts[ 0 ]; if (firstElement == QLatin1String("From")) { mHeaderType = FromHeader; diff --git a/src/snippets/snippetattachmentwidget.cpp b/src/snippets/snippetattachmentwidget.cpp index 52abc9b..40ace45 100644 --- a/src/snippets/snippetattachmentwidget.cpp +++ b/src/snippets/snippetattachmentwidget.cpp @@ -71,7 +71,11 @@ void SnippetAttachmentWidget::clear() void SnippetAttachmentWidget::slotSelectAttachment() { QPointer dlg = new MailCommon::SnippetSelectAttachmentDialog(this); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) dlg->setAttachments(mLineEdit->text().split(QLatin1Char(','), QString::SkipEmptyParts)); +#else + dlg->setAttachments(mLineEdit->text().split(QLatin1Char(','), Qt::SkipEmptyParts)); +#endif if (dlg->exec()) { mLineEdit->setText(dlg->attachments().join(QLatin1Char(','))); Q_EMIT wasChanged();