Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KAddressBook
Commits
98cc79d1
Commit
98cc79d1
authored
Aug 07, 2021
by
Laurent Montel
Browse files
We depend against 5.84
parent
8f6cce19
Pipeline
#73750
failed with stage
in 2 minutes and 40 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mainwidget.cpp
View file @
98cc79d1
...
...
@@ -355,11 +355,7 @@ void MainWidget::configure()
QPointer
<
KCMultiDialog
>
dlg
=
new
KCMultiDialog
(
this
);
const
QVector
<
KPluginMetaData
>
availablePlugins
=
KPluginLoader
::
findPlugins
(
QStringLiteral
(
"pim/kcms/kaddressbook"
));
for
(
const
KPluginMetaData
&
metaData
:
availablePlugins
)
{
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
dlg
->
addModule
(
metaData
);
#else
dlg
->
addModule
(
metaData
.
pluginId
());
#endif
}
dlg
->
exec
();
delete
dlg
;
...
...
src/mainwindow.cpp
View file @
98cc79d1
...
...
@@ -108,11 +108,7 @@ void MainWindow::configure()
void
MainWindow
::
configureKeyBindings
()
{
#if KXMLGUI_VERSION <= QT_VERSION_CHECK(5, 84, 0)
KShortcutsDialog
*
dlg
=
new
KShortcutsDialog
(
KShortcutsEditor
::
AllActions
,
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
);
#else
KShortcutsDialog
*
dlg
=
new
KShortcutsDialog
(
this
);
#endif
dlg
->
setAttribute
(
Qt
::
WA_DeleteOnClose
);
dlg
->
setModal
(
false
);
dlg
->
addCollection
(
actionCollection
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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