diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch')
-rw-r--r-- | kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch deleted file mode 100644 index 67eab1d6315d..000000000000 --- a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001 -From: Stefano Crocco <stefano.crocco@alice.it> -Date: Tue, 14 Apr 2020 10:21:48 +0200 -Subject: [PATCH] Fix crash due to changes in KBookmarkMenu - -Summary: -Since version 5.69, KBookmarkMenu doesn't automatically create an action -collection. This causes Konqueror to crash when going on a submenu in -the Bookmarks menu. To avoid it, manually create the action collection. - -Also, avoid calling the version of KBookmarkMenu construction which -takes a KActionCollection, as it's deprecated. - -Test Plan: -Open the bookmarks menu and hover with the mouse on a submenu. Check -that it crashes. Do the same after this change and check it doesn't crash -anymore. - -Reviewers: dfaure, nicolasfella - -Reviewed By: dfaure, nicolasfella - -Subscribers: arojas, poboiko - -Differential Revision: https://phabricator.kde.org/D28789 ---- - src/konqbookmarkmenu.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h -index 9ff4c0f55..d47960f7b 100644 ---- a/src/konqbookmarkmenu.h -+++ b/src/konqbookmarkmenu.h -@@ -26,6 +26,7 @@ - #include "kbookmarkcontextmenu.h" - - #include <KActionCollection> -+#include <kbookmarks_version.h> - - namespace Konqueror { // to avoid clashing with KF5::Bookmarks which had a KonqBookmarkMenu class. Remove once using KF6. - -@@ -61,7 +62,10 @@ public: - KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) - : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) - { -+//KBookmarkMenu doesn't create an action collection only in version 5.69.0 -+#if KBOOKMARKS_VERSION == QT_VERSION_CHECK(5, 69, 0) - m_actionCollection = new KActionCollection(this); -+#endif - } - - protected: --- -2.26.2 - |