lmms: remove broken KCheckAccelerators workaround
This commit is contained in:
parent
ea2eff6d1b
commit
87e077ffdc
|
@ -0,0 +1,35 @@
|
|||
--- a/src/gui/MainWindow.cpp
|
||||
+++ b/src/gui/MainWindow.cpp
|
||||
@@ -65,22 +65,6 @@
|
||||
|
||||
#include "lmmsversion.h"
|
||||
|
||||
-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
|
||||
-//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);
|
||||
- DisablerFunc setNoAccelerators =
|
||||
- reinterpret_cast<DisablerFunc>(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget"));
|
||||
- if(setNoAccelerators)
|
||||
- {
|
||||
- setNoAccelerators(mainWindow);
|
||||
- }
|
||||
- kf5WidgetsAddon.unload();
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
|
||||
MainWindow::MainWindow() :
|
||||
m_workspace( NULL ),
|
||||
@@ -92,9 +76,6 @@ MainWindow::MainWindow() :
|
||||
m_metronomeToggle( 0 ),
|
||||
m_session( Normal )
|
||||
{
|
||||
-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
|
||||
- disableAutoKeyAccelerators(this);
|
||||
-#endif
|
||||
setAttribute( Qt::WA_DeleteOnClose );
|
||||
|
||||
QWidget * main_widget = new QWidget( this );
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'lmms'
|
||||
pkgname=lmms
|
||||
version=1.2.2
|
||||
revision=3
|
||||
revision=4
|
||||
archs="~armv6*"
|
||||
build_style=cmake
|
||||
configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF -DWANT_CARLA=OFF"
|
||||
|
|
Loading…
Reference in New Issue