From 3660ac9a6cf9782490e28ab7f4d1b45f72b88975 Mon Sep 17 00:00:00 2001 From: Michael Gregorius Date: Fri, 8 Dec 2017 18:50:55 +0100 Subject: [PATCH] Revert "Fix a crash that occurs when library "KF5WidgetsAddons" cannot be loaded" This reverts commit 17fb59cdeb504a41dba8a8fe9f74388dd90e1f20. It's reverted because it's already fixed in stable-1.2 and only need to be merged. --- src/gui/MainWindow.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d8ea33f33..32d16546b 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -69,13 +69,8 @@ //Work around an issue on KDE5 as per https://bugs.kde.org/show_bug.cgi?id=337491#c21 void disableAutoKeyAccelerators(QWidget* mainWindow) { + using DisablerFunc = void(*)(QWidget*); QLibrary kf5WidgetsAddon("KF5WidgetsAddons", 5); - if (!kf5WidgetsAddon.isLoaded()) - { - return; - } - - using DisablerFunc = void(*)(QWidget*); DisablerFunc setNoAccelerators = reinterpret_cast(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget")); if(setNoAccelerators)