Commit 4bbf3edf authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against 5.83

parent b1183a30
Pipeline #66901 passed with stage
in 39 minutes and 56 seconds
...@@ -314,11 +314,7 @@ void AttachmentControllerBase::Private::editDone(MessageViewer::EditorWatcher *w ...@@ -314,11 +314,7 @@ void AttachmentControllerBase::Private::editDone(MessageViewer::EditorWatcher *w
void AttachmentControllerBase::Private::createOpenWithMenu(QMenu *topMenu, const AttachmentPart::Ptr &part) void AttachmentControllerBase::Private::createOpenWithMenu(QMenu *topMenu, const AttachmentPart::Ptr &part)
{ {
const QString contentTypeStr = QString::fromLatin1(part->mimeType()); const QString contentTypeStr = QString::fromLatin1(part->mimeType());
#if KIO_VERSION < QT_VERSION_CHECK(5, 83, 0)
const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr, QString());
#else
const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr); const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr);
#endif
if (!offers.isEmpty()) { if (!offers.isEmpty()) {
QMenu *menu = topMenu; QMenu *menu = topMenu;
auto actionGroup = new QActionGroup(menu); auto actionGroup = new QActionGroup(menu);
......
...@@ -425,11 +425,7 @@ void ViewerPrivate::scrollToAnchor(const QString &anchor) ...@@ -425,11 +425,7 @@ void ViewerPrivate::scrollToAnchor(const QString &anchor)
void ViewerPrivate::createOpenWithMenu(QMenu *topMenu, const QString &contentTypeStr, bool fromCurrentContent) void ViewerPrivate::createOpenWithMenu(QMenu *topMenu, const QString &contentTypeStr, bool fromCurrentContent)
{ {
#if KIO_VERSION > QT_VERSION_CHECK(5, 82, 0)
const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr); const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr);
#else
const KService::List offers = KFileItemActions::associatedApplications(QStringList() << contentTypeStr, QString());
#endif
if (!offers.isEmpty()) { if (!offers.isEmpty()) {
QMenu *menu = topMenu; QMenu *menu = topMenu;
auto actionGroup = new QActionGroup(menu); auto actionGroup = new QActionGroup(menu);
......
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