diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-23 14:21:32 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-23 14:21:32 (GMT) |
| commit | 9a77d6c409b991957fc069a2b47476a419ea1aab (patch) | |
| tree | 905be30648927c15aae4812b9d68fe1be53146ce | |
| parent | 6689850242c524cea7877d5fdb41d235e0b55d87 (diff) | |
| download | Qt-9a77d6c409b991957fc069a2b47476a419ea1aab.zip Qt-9a77d6c409b991957fc069a2b47476a419ea1aab.tar.gz Qt-9a77d6c409b991957fc069a2b47476a419ea1aab.tar.bz2 | |
Finish up my AA_DontSwapMetaAndControl feature.
Ugh. The whole reason I added this was so that the text() would be
preserved for people that did stuff with Control. Somehow in all the
other fixes I did, I forgot to actually do that part.
Reviewed-by: Denis
| -rw-r--r-- | src/gui/kernel/qkeymapper_mac.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp index 017c13c..8eee665 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/kernel/qkeymapper_mac.cpp @@ -729,8 +729,10 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, EventHandlerCallRef e QString text(ourChar); /* This is actually wrong - but unfortunatly it is the best that can be done for now because of the Control/Meta mapping problems */ - if (modifiers & (Qt::ControlModifier | Qt::MetaModifier)) + if (modifiers & (Qt::ControlModifier | Qt::MetaModifier) + && !qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { text = QString(); + } if (widget) { |