From 1498650082712933a4c284ca6cda92a046812455 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 2 May 2020 15:48:06 +0100 Subject: [PATCH] Restore compatibility with KBookmarkMenu < 5.69 Forwarded: not-needed Last-Update: 2020-05-02 Gbp-Pq: Name old-kbookmarkmenu.diff --- src/konqbookmarkmenu.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h index 9ff4c0f..3a42335 100644 --- a/src/konqbookmarkmenu.h +++ b/src/konqbookmarkmenu.h @@ -47,9 +47,10 @@ public: * @param collec parent collection for the KActions. */ KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec) - : KBookmarkMenu(mgr, owner, parentMenu->menu()) + : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec) { - m_actionCollection = collec; + if (!m_actionCollection) + m_actionCollection = collec; } ~KonqBookmarkMenu() override {} @@ -61,7 +62,8 @@ public: KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) { - m_actionCollection = new KActionCollection(this); + if (!m_actionCollection) + m_actionCollection = new KActionCollection(this); } protected: -- 2.30.2