Fix using modifier keys

* Fix error in regex that prevented use of modifier keys in general.
* Added '#' modifier to press the "Meta" button. This correlates to the Windows key on Windows and Command key on macOS.
* Fix #6695 - send proper modifier keys based on documentation

2 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/osutils/macutils/MacUtils.cpp b/src/gui/osutils/macutils/MacUtils.cpp
index 5b4751603..c7d91950f 100644
--- a/src/gui/osutils/macutils/MacUtils.cpp
+++ b/src/gui/osutils/macutils/MacUtils.cpp
@@ -366,6 +366,10 @@ uint16 MacUtils::qtToNativeKeyCode(Qt::Key key)
     case Qt::Key_Shift:
         return kVK_Shift;
     case Qt::Key_Control:
+        return kVK_Control;
+    case Qt::Key_Alt:
+        return kVK_Option;
+    case Qt::Key_Meta:
         return kVK_Command;
     case Qt::Key_Backspace:
         return kVK_Delete;
diff --git a/src/gui/osutils/winutils/WinUtils.cpp b/src/gui/osutils/winutils/WinUtils.cpp
index d9c1b6907..3aec7d5f7 100644
--- a/src/gui/osutils/winutils/WinUtils.cpp
+++ b/src/gui/osutils/winutils/WinUtils.cpp
@@ -265,6 +265,8 @@ WORD WinUtils::qtToNativeKeyCode(Qt::Key key)
         return VK_DELETE;   // 0x2E
     case Qt::Key_Help:
         return VK_HELP;     // 0x2F
+    case Qt::Key_Meta:
+        return VK_LWIN;     // 0x5B
 
     case Qt::Key_F1:
         return VK_F1;       // 0x70