--- qt-mac-opensource-src-4.5.3/src/gui/kernel/qkeymapper_mac.cpp 2009-12-02 21:26:23.000000000 -0800 +++ orig/qt-mac-opensource-src-4.5.1/src/gui/kernel/qkeymapper_mac.cpp 2009-04-21 16:57:42.000000000 -0700 @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Qt Software Information (qt-info@nokia.com) ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -21,9 +20,10 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU @@ -33,8 +33,8 @@ ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -138,9 +138,9 @@ static qt_mac_enum_mapper qt_mac_modifier_symbols[] = { { shiftKey, QT_MAC_MAP_ENUM(Qt::ShiftModifier) }, { rightShiftKey, QT_MAC_MAP_ENUM(Qt::ShiftModifier) }, - { controlKey, QT_MAC_MAP_ENUM(Qt::ControlModifier) }, - { rightControlKey, QT_MAC_MAP_ENUM(Qt::ControlModifier) }, - { cmdKey, QT_MAC_MAP_ENUM(Qt::MetaModifier) }, + { controlKey, QT_MAC_MAP_ENUM(Qt::MetaModifier) }, + { rightControlKey, QT_MAC_MAP_ENUM(Qt::MetaModifier) }, + { cmdKey, QT_MAC_MAP_ENUM(Qt::ControlModifier) }, { optionKey, QT_MAC_MAP_ENUM(Qt::AltModifier) }, { rightOptionKey, QT_MAC_MAP_ENUM(Qt::AltModifier) }, { kEventKeyModifierNumLockMask, QT_MAC_MAP_ENUM(Qt::KeypadModifier) }, @@ -189,9 +189,9 @@ static qt_mac_enum_mapper modifier_key_symbols[] = { { shiftKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Shift) }, { rightShiftKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Shift) }, //??? - { controlKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Control) }, - { rightControlKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Control) }, //??? - { cmdKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Meta) }, + { controlKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Meta) }, + { rightControlKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Meta) }, //??? + { cmdKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Control) }, { optionKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Alt) }, { rightOptionKeyBit, QT_MAC_MAP_ENUM(Qt::Key_Alt) }, //??? { alphaLockBit, QT_MAC_MAP_ENUM(Qt::Key_CapsLock) }, @@ -497,9 +497,9 @@ static UInt32 tmp_state = 0L; if (*outModifiers & Qt::ShiftModifier) tmp_mod |= shiftKey; - if (*outModifiers & Qt::ControlModifier) - tmp_mod |= controlKey; if (*outModifiers & Qt::MetaModifier) + tmp_mod |= controlKey; + if (*outModifiers & Qt::ControlModifier) tmp_mod |= cmdKey; if (GetCurrentEventKeyModifiers() & alphaLock) //no Qt mapper tmp_mod |= alphaLock;