Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
4bbf3edf
Commit
4bbf3edf
authored
Jun 21, 2021
by
Laurent Montel
😁
Browse files
We depend against 5.83
parent
b1183a30
Pipeline
#66901
passed with stage
in 39 minutes and 56 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
messagecomposer/src/attachment/attachmentcontrollerbase.cpp
View file @
4bbf3edf
...
...
@@ -314,11 +314,7 @@ void AttachmentControllerBase::Private::editDone(MessageViewer::EditorWatcher *w
void
AttachmentControllerBase
::
Private
::
createOpenWithMenu
(
QMenu
*
topMenu
,
const
AttachmentPart
::
Ptr
&
part
)
{
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
);
#endif
if
(
!
offers
.
isEmpty
())
{
QMenu
*
menu
=
topMenu
;
auto
actionGroup
=
new
QActionGroup
(
menu
);
...
...
messageviewer/src/viewer/viewer_p.cpp
View file @
4bbf3edf
...
...
@@ -425,11 +425,7 @@ void ViewerPrivate::scrollToAnchor(const QString &anchor)
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
);
#else
const
KService
::
List
offers
=
KFileItemActions
::
associatedApplications
(
QStringList
()
<<
contentTypeStr
,
QString
());
#endif
if
(
!
offers
.
isEmpty
())
{
QMenu
*
menu
=
topMenu
;
auto
actionGroup
=
new
QActionGroup
(
menu
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment