diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-31 17:45:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:37 +0200 |
| commit | bd822bedfea5126b12c32523a68c3a1ac7a8931d (patch) | |
| tree | 0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/plugins/platforms/cocoa/qcocoakeymapper.h | |
| parent | 84c10500b1730e8d947732728d190fde612fc840 (diff) | |
| parent | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoakeymapper.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoakeymapper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.h b/src/plugins/platforms/cocoa/qcocoakeymapper.h index 0629de9317..4f419b3651 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.h +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h @@ -83,6 +83,7 @@ class QCocoaKeyMapper public: QCocoaKeyMapper(); ~QCocoaKeyMapper(); + static Qt::KeyboardModifiers queryKeyboardModifiers(); QList<int> possibleKeys(const QKeyEvent *event) const; bool updateKeyboard(); void deleteLayouts(); |