4 files changed, 6 insertions, 6 deletions
diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp
index dec11dc4..38c97ffd 100644
--- a/qxt-mini/qxtglobalshortcut.cpp
+++ b/qxt-mini/qxtglobalshortcut.cpp
@@ -40,7 +40,7 @@
 #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> QxtGlobalShortcutPrivate::shortcuts;
+QMultiMap<QPair<quint32, quint32>, QxtGlobalShortcut*> QxtGlobalShortcutPrivate::shortcuts;
 
 void QxtGlobalShortcutPrivate::event_filter_installer::ensure_event_filter()
 {
diff --git a/qxt-mini/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp
index c91d763d..571a6783 100644
--- a/qxt-mini/qxtglobalshortcut_mac.cpp
+++ b/qxt-mini/qxtglobalshortcut_mac.cpp
@@ -266,7 +266,7 @@ bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nat
     return !UnregisterEventHotKey(ref);
 }
 bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
-    void *message, long *result)
+    void *message, qintptr *result)
 {
     return false;
 }
diff --git a/qxt-mini/qxtglobalshortcut_p.h b/qxt-mini/qxtglobalshortcut_p.h
index be708ba6..e6e77809 100644
--- a/qxt-mini/qxtglobalshortcut_p.h
+++ b/qxt-mini/qxtglobalshortcut_p.h
@@ -34,7 +34,7 @@
 #include "qxtglobalshortcut.h"
 #include <QAbstractEventDispatcher>
 #include <QKeySequence>
-#include <QHash>
+#include <QMultiMap>
 
 #include <QAbstractNativeEventFilter>
 
@@ -54,7 +54,7 @@ public:
     bool unsetShortcut();
 
     static bool error;
-    bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
+    bool nativeEventFilter(const QByteArray & eventType, void * message, qintptr * result) override;
 
     static void activateShortcut(quint32 nativeKey, quint32 nativeMods, bool is_down);
 
@@ -70,7 +70,7 @@ private:
     static bool registerShortcut(quint32 nativeKey, quint32 nativeMods);
     static bool unregisterShortcut(quint32 nativeKey, quint32 nativeMods);
 
-    static QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> shortcuts;
+    static QMultiMap<QPair<quint32, quint32>, QxtGlobalShortcut*> shortcuts;
 };
 
 #endif // QXTGLOBALSHORTCUT_P_H
diff --git a/qxt-mini/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp
index 01894cfc..4ddf4f6b 100644
--- a/qxt-mini/qxtglobalshortcut_x11.cpp
+++ b/qxt-mini/qxtglobalshortcut_x11.cpp
@@ -339,7 +339,7 @@ QMutex keybinding::lock;
 bool QxtX11ErrorHandler::error = false;
 
 bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
-    void *message, long *)
+    void *message, qintptr *)
 {
     QxtX11Data x11;