diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
| commit | bcbe1c3438f38087b16465f5b5aeac5d54a42d40 (patch) | |
| tree | d939e5eb97c676fd8202595f405bcd8b0170175c /src/gui/kernel/qevent.cpp | |
| parent | 1099908428c594d67fe1da740126f4acfcdc8a0a (diff) | |
| parent | c711885b5694a51f0c22908e57e74c60188bd879 (diff) | |
| download | Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.zip Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.gz Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index d3a0228..a77325c 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -899,6 +899,17 @@ bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const uint searchkey = (modifiers() | key()) & ~(Qt::KeypadModifier); //The keypad modifier should not make a difference uint platform = QApplicationPrivate::currentPlatform(); +#ifdef Q_WS_MAC + if (qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { + uint oldSearchKey = searchkey; + searchkey &= ~(Qt::ControlModifier | Qt::MetaModifier); + if (oldSearchKey & Qt::ControlModifier) + searchkey |= Qt::MetaModifier; + if (oldSearchKey & Qt::MetaModifier) + searchkey |= Qt::ControlModifier; + } +#endif + uint N = QKeySequencePrivate::numberOfKeyBindings; int first = 0; int last = N - 1; |