Cocoa: added queryKeyboardModifiers() in platform plugin

Task-number: QTBUG-37181
Change-Id: I9256d0c9b83d6e5982864dc747586cbe2322b60c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
bb10
Liang Qi 2014-03-06 14:42:47 +01:00 committed by The Qt Project
parent 5334a2cea7
commit eadaaf69fb
4 changed files with 12 additions and 0 deletions

View File

@ -129,6 +129,7 @@ public:
QCocoaServices *services() const;
QVariant styleHint(StyleHint hint) const;
Qt::KeyboardModifiers queryKeyboardModifiers() const;
QList<int> possibleKeys(const QKeyEvent *event) const;
void updateScreens();

View File

@ -464,6 +464,11 @@ QVariant QCocoaIntegration::styleHint(StyleHint hint) const
return QPlatformIntegration::styleHint(hint);
}
Qt::KeyboardModifiers QCocoaIntegration::queryKeyboardModifiers() const
{
return QCocoaKeyMapper::queryKeyboardModifiers();
}
QList<int> QCocoaIntegration::possibleKeys(const QKeyEvent *event) const
{
return mKeyboardMapper->possibleKeys(event);

View File

@ -83,6 +83,7 @@ class QCocoaKeyMapper
public:
QCocoaKeyMapper();
~QCocoaKeyMapper();
static Qt::KeyboardModifiers queryKeyboardModifiers();
QList<int> possibleKeys(const QKeyEvent *event) const;
bool updateKeyboard();
void deleteLayouts();

View File

@ -346,6 +346,11 @@ QCocoaKeyMapper::~QCocoaKeyMapper()
deleteLayouts();
}
Qt::KeyboardModifiers QCocoaKeyMapper::queryKeyboardModifiers()
{
return qt_mac_get_modifiers(GetCurrentEventKeyModifiers());
}
bool QCocoaKeyMapper::updateKeyboard()
{
const UCKeyboardLayout *uchrData = 0;