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 9ff4c0f55657f723dde508a980dfb3744b76ffbe..3a42335e83fd269c9c07dae33f625cbb8ad3a600 100644 (file)
--- 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: