Make the meta modifier key work for global shortcuts on Linux. Fixes issue #329

2010-06-18 00:46:53 +00:00 · 2010-06-18 00:46:53 +00:00 · 35f0c65046
parent 28505857fc
commit 35f0c65046
2 changed files with 17 additions and 1 deletions
--- a/3rdparty/qxt/meta-modifier.patch
+++ b/3rdparty/qxt/meta-modifier.patch
@ -0,0 +1,15 @@
+Index: qxtglobalshortcut_x11.cpp
+===================================================================
+--- qxtglobalshortcut_x11.cpp	(revision 1208)
+++ qxtglobalshortcut_x11.cpp	(working copy)
+@@ -74,8 +74,9 @@
+         native |= ControlMask;
+     if (modifiers & Qt::AltModifier)
+         native |= Mod1Mask;
+    if (modifiers & Qt::MetaModifier)
+        native |= Mod4Mask;
+     // TODO: resolve these?
+-    //if (modifiers & Qt::MetaModifier)
+     //if (modifiers & Qt::KeypadModifier)
+     //if (modifiers & Qt::GroupSwitchModifier)
+     return native;
--- a/3rdparty/qxt/qxtglobalshortcut_x11.cpp
+++ b/3rdparty/qxt/qxtglobalshortcut_x11.cpp
@ -74,8 +74,9 @@ quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifier
        native |= ControlMask;
    if (modifiers & Qt::AltModifier)
        native |= Mod1Mask;
+    if (modifiers & Qt::MetaModifier)
+        native |= Mod4Mask;
    // TODO: resolve these?
-    //if (modifiers & Qt::MetaModifier)
    //if (modifiers & Qt::KeypadModifier)
    //if (modifiers & Qt::GroupSwitchModifier)
    return native;