From: Pino Toscano <pino@debian.org>
Date: Sat, 2 May 2020 14:48:06 +0000 (+0100)
Subject: Restore compatibility with KBookmarkMenu < 5.69
X-Git-Tag: archive/raspbian/4%20.04.0-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1498650082712933a4c284ca6cda92a046812455;p=konqueror.git

Restore compatibility with KBookmarkMenu < 5.69

Forwarded: not-needed
Last-Update: 2020-05-02


Gbp-Pq: Name old-kbookmarkmenu.diff
---

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: