Commit 7972b985 authored by Ahmad Samir's avatar Ahmad Samir
Browse files

[KCharSelect] Adapt the code to KBookmarks-5.69 changes

Test Plan:
The Bookmarks menu has the usual entries, and the bookmark actions are
displayed in the configure shortcuts dialog.

Reviewers: cfeck

Reviewed By: cfeck

Subscribers: asturmlechner, kde-utils-devel

Differential Revision: https://phabricator.kde.org/D28927
parent 94c411bf
......@@ -27,6 +27,7 @@
#include <QMenu>
#include <KActionCollection>
#include <kbookmarks_version.h>
#include <KBookmarkManager>
#include <KBookmarkMenu>
#include <KConfigGroup>
......@@ -185,7 +186,14 @@ KCharSelectDia::KCharSelectDia()
action->setText(i18n("Bookmarks"));
QMenu *bmmenu = new QMenu(this);
action->setMenu(bmmenu);
#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu, actionCollection());
#else
KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu);
actionCollection()->addActions(bmmenu->actions());
#endif
bm->setParent(this);
setupGUI(ToolBar|Keys|Save|Create);
......
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