Autotest, Mac: added more native key event testing

Added a couple of more tests that checks, among others,
modifier flags. It turns out that there are some issues
related to this:
    1. When releasing a key while holding the command
       modifier, we do not key at key up event from cocoa.
    2. The AA_MacDontSwapCtrlAndMeta attribute turns out
       to be half-way implemented.

This test will not fail on any of this issues.

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/macnativeevents/qnativeevents_mac.cpp b/tests/auto/macnativeevents/qnativeevents_mac.cpp
index 6c04bf3..cc12cc9 100644
--- a/tests/auto/macnativeevents/qnativeevents_mac.cpp
+++ b/tests/auto/macnativeevents/qnativeevents_mac.cpp
@@ -54,11 +54,11 @@ static Qt::KeyboardModifiers getModifiersFromQuartzEvent(CGEventRef inEvent)
     if (flags & kCGEventFlagMaskShift || flags & kCGEventFlagMaskAlphaShift)
         m |= Qt::ShiftModifier;
     if (flags & kCGEventFlagMaskControl)
-        m |= Qt::MetaModifier;
+        m |= Qt::ControlModifier;
     if (flags & kCGEventFlagMaskAlternate)
         m |= Qt::AltModifier;
     if (flags & kCGEventFlagMaskCommand)
-        m |= Qt::ControlModifier;
+        m |= Qt::MetaModifier;
     return m;
 }
 
@@ -67,11 +67,11 @@ static void setModifiersFromQNativeEvent(CGEventRef inEvent, const QNativeEvent
     CGEventFlags flags = 0;
     if (event.modifiers.testFlag(Qt::ShiftModifier))
         flags |= kCGEventFlagMaskShift;
-    if (event.modifiers.testFlag(Qt::MetaModifier))
+    if (event.modifiers.testFlag(Qt::ControlModifier))
         flags |= kCGEventFlagMaskControl;
     if (event.modifiers.testFlag(Qt::AltModifier))
         flags |= kCGEventFlagMaskAlternate;
-    if (event.modifiers.testFlag(Qt::ControlModifier))
+    if (event.modifiers.testFlag(Qt::MetaModifier))
         flags |= kCGEventFlagMaskCommand;
     CGEventSetFlags(inEvent, flags);
 }