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
f354f2f9
Commit
f354f2f9
authored
Jun 20, 2021
by
Laurent Montel
Browse files
Make it compile with last api
parent
d72b3073
Pipeline
#66768
passed with stage
in 5 minutes and 24 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
f354f2f9
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include
<QAction>
#include
<QAction>
#include
<QMenuBar>
#include
<QMenuBar>
#include
<QPointer>
#include
<QPointer>
#include
<kxmlgui_version.h>
#ifdef WITH_KUSERFEEDBACK
#ifdef WITH_KUSERFEEDBACK
#include
"userfeedback/userfeedbackmanager.h"
#include
"userfeedback/userfeedbackmanager.h"
#include
<KUserFeedback/NotificationPopup>
#include
<KUserFeedback/NotificationPopup>
...
@@ -107,9 +108,15 @@ void MainWindow::configure()
...
@@ -107,9 +108,15 @@ void MainWindow::configure()
void
MainWindow
::
configureKeyBindings
()
void
MainWindow
::
configureKeyBindings
()
{
{
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5, 84, 0)
if
(
KShortcutsDialog
::
configure
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
))
{
if
(
KShortcutsDialog
::
configure
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
this
))
{
mMainWidget
->
updateQuickSearchText
();
mMainWidget
->
updateQuickSearchText
();
}
}
#else
KShortcutsDialog
::
showDialog
(
actionCollection
(),
KShortcutsEditor
::
LetterShortcutsAllowed
,
/*isModal*/
true
,
this
);
// We can't detect if we accepted or not => update quick search all the time. Perhaps in the future we will have a signal.
mMainWidget
->
updateQuickSearchText
();
#endif
}
}
void
MainWindow
::
configureToolbars
()
void
MainWindow
::
configureToolbars
()
...
...
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