src/gui/kernel/qt_cocoa_helpers_mac.mm
changeset 33 3e2da88830cd
parent 30 5dc02b23752f
child 37 758a864f9613
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm	Wed Aug 18 10:37:55 2010 +0300
@@ -682,10 +682,12 @@
     NSEvent *event = static_cast<NSEvent *>(keyEvent);
     EventRef key_event = static_cast<EventRef>(const_cast<void *>([event eventRef]));
     Q_ASSERT(key_event);
+    unsigned int info = 0;
     if ([event type] == NSKeyDown) {
         NSString *characters = [event characters];
         unichar value = [characters characterAtIndex:0];
         qt_keymapper_private()->updateKeyMap(0, key_event, (void *)&value);
+        info = value;
     }
 
     // Redirect keys to alien widgets.
@@ -701,9 +703,8 @@
 
     if (mustUseCocoaKeyEvent())
         return qt_dispatchKeyEventWithCocoa(keyEvent, widgetToGetEvent);
-    bool isAccepted;
-    bool consumed = qt_keymapper_private()->translateKeyEvent(widgetToGetEvent, 0, key_event, &isAccepted, true);
-    return consumed && isAccepted;
+    bool consumed = qt_keymapper_private()->translateKeyEvent(widgetToGetEvent, 0, key_event, &info, true);
+    return consumed && (info != 0);
 #endif
 }