From 091b1b820906ce4c9461e6f5e5b0f247284cdba8 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 4 Sep 2020 23:00:42 +0200
Subject: [PATCH] Use QKeyCombination with Qt 6

---
 src/globalshortcuts/globalshortcut.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/globalshortcuts/globalshortcut.cpp b/src/globalshortcuts/globalshortcut.cpp
index bfffef040..39dbbfe17 100644
--- a/src/globalshortcuts/globalshortcut.cpp
+++ b/src/globalshortcuts/globalshortcut.cpp
@@ -26,6 +26,10 @@
 #include <QHash>
 #include <QFlags>
 #include <QtDebug>
+#include <QKeySequence>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  include <QKeyCombination>
+#endif
 
 #include "core/logging.h"
 
@@ -79,9 +83,15 @@ bool GlobalShortcut::setShortcut(const QKeySequence &shortcut) {
   if (shortcut.isEmpty()) return false;
   shortcut_ = shortcut;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  QKeyCombination key_combination(shortcut[0]);
+  qt_key_ = key_combination.key();
+  qt_mods_ = key_combination.keyboardModifiers();
+#else
   Qt::KeyboardModifiers all_mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier;
   qt_key_ = Qt::Key((shortcut[0] ^ all_mods) & shortcut[0]);
   qt_mods_ = Qt::KeyboardModifiers(shortcut[0] & all_mods);
+#endif
 
   native_key_ = nativeKeycode(qt_key_);
   if (native_key_ == 0) return false;