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
KMail
Commits
bf8ac7de
Commit
bf8ac7de
authored
Aug 07, 2021
by
Laurent Montel
😁
Browse files
We depend against 5.84
parent
aea1b59c
Pipeline
#73749
failed with stage
in 2 minutes and 46 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ktnef/src/ktnefmain.cpp
View file @
bf8ac7de
...
...
@@ -163,11 +163,7 @@ void KTNEFMain::setupActions()
void
KTNEFMain
::
slotConfigureKeys
()
{
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 84, 0)
KShortcutsDialog
::
configure
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
);
#else
KShortcutsDialog
::
showDialog
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
);
#endif
}
void
KTNEFMain
::
setupStatusbar
()
...
...
@@ -551,11 +547,7 @@ void KTNEFMain::createOpenWithMenu(QMenu *topMenu)
}
KTNEFAttach
*
attach
=
mView
->
getSelection
().
at
(
0
);
QString
mimename
(
attach
->
mimeTag
());
#if KIO_VERSION < QT_VERSION_CHECK(5, 83, 0)
const
KService
::
List
offers
=
KFileItemActions
::
associatedApplications
(
QStringList
()
<<
mimename
,
QString
());
#else
const
KService
::
List
offers
=
KFileItemActions
::
associatedApplications
(
QStringList
()
<<
mimename
);
#endif
if
(
!
offers
.
isEmpty
())
{
QMenu
*
menu
=
topMenu
;
auto
actionGroup
=
new
QActionGroup
(
menu
);
...
...
src/configuredialog/configuresecuritypage.cpp
View file @
bf8ac7de
...
...
@@ -373,14 +373,10 @@ void SecurityPage::WarningTab::slotConfigureGnupg()
{
QPointer
<
GpgSettingsDialog
>
dlg
(
new
GpgSettingsDialog
(
this
));
KPageWidgetItem
*
page
=
nullptr
;
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
const
auto
plugin
=
KPluginMetaData
::
findPluginById
(
QStringLiteral
(
"pim/kcms/kleopatra"
),
QStringLiteral
(
"kleopatra_config_gnupgsystem"
));
if
(
plugin
.
isValid
())
{
page
=
dlg
->
addModule
(
plugin
);
}
#else
page
=
dlg
->
addModule
(
QStringLiteral
(
"kleopatra_config_gnupgsystem"
));
#endif
if
(
!
page
)
{
auto
info
=
new
QLabel
(
i18n
(
"The module is missing. Please verify your installation. This module is provided by Kleopatra."
),
this
);
QFont
font
=
info
->
font
();
...
...
src/editor/kmcomposerwin.cpp
View file @
bf8ac7de
...
...
@@ -3398,11 +3398,7 @@ void KMComposerWin::slotUpdateToolbars()
void
KMComposerWin
::
slotEditKeys
()
{
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 84, 0)
KShortcutsDialog
::
configure
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsDisallowed
);
#else
KShortcutsDialog
::
showDialog
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
);
#endif
}
void
KMComposerWin
::
setFocusToEditor
()
...
...
src/kmmainwin.cpp
View file @
bf8ac7de
...
...
@@ -87,9 +87,7 @@ KMMainWin::KMMainWin(QWidget *)
mKMMainWidget
->
updateQuickSearchLineText
();
mShowMenuBarAction
->
setChecked
(
KMailSettings
::
self
()
->
showMenuBar
());
slotToggleMenubar
(
true
);
#if KXMLGUI_VERSION >= QT_VERSION_CHECK(5, 84, 0)
connect
(
guiFactory
(),
&
KXMLGUIFactory
::
shortcutsSaved
,
this
,
&
KMMainWin
::
slotShortcutSaved
);
#endif
}
KMMainWin
::~
KMMainWin
()
...
...
@@ -250,13 +248,7 @@ bool KMMainWin::queryClose()
void
KMMainWin
::
slotConfigureShortcuts
()
{
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 84, 0)
if
(
guiFactory
()
->
configureShortcuts
())
{
mKMMainWidget
->
updateQuickSearchLineText
();
}
#else
guiFactory
()
->
showConfigureShortcutsDialog
();
#endif
}
void
KMMainWin
::
slotShortcutSaved
()
...
...
src/kontactplugin/summary/summaryview_part.cpp
View file @
bf8ac7de
...
...
@@ -411,11 +411,7 @@ void SummaryViewPart::slotConfigure()
const
auto
metaDataList
=
KPluginLoader
::
findPlugins
(
QStringLiteral
(
"pim/kcms/summary/"
));
for
(
const
auto
&
metaData
:
metaDataList
)
{
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
dlg
->
addModule
(
metaData
);
#else
dlg
->
addModule
(
metaData
.
pluginId
());
#endif
}
dlg
->
exec
();
...
...
Write
Preview
Supports
Markdown
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