diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-24 16:51:23 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-31 12:35:45 +0000 |
| commit | 556beea4c373395e16aa00ae7e5e5db8e6f46468 (patch) | |
| tree | 9ec6c2058fd0bb46d22bc139d625d01362061cd0 /src/plugins/platforms/cocoa/qcocoamenuitem.mm | |
| parent | b02fe1bfe7bc5daa503dc3a274570aad0d8dca5a (diff) | |
macOS: Update all deprecated enums to their 10.12+ equivalents
Change-Id: I3034258da95c9c70eb6758db92967f438617f6e9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuitem.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index e1572e1800..21faa6d985 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -61,13 +61,13 @@ static quint32 constructModifierMask(quint32 accel_key) quint32 ret = 0; const bool dontSwap = qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta); if ((accel_key & Qt::CTRL) == Qt::CTRL) - ret |= (dontSwap ? NSControlKeyMask : NSCommandKeyMask); + ret |= (dontSwap ? NSEventModifierFlagControl : NSEventModifierFlagCommand); if ((accel_key & Qt::META) == Qt::META) - ret |= (dontSwap ? NSCommandKeyMask : NSControlKeyMask); + ret |= (dontSwap ? NSEventModifierFlagCommand : NSEventModifierFlagControl); if ((accel_key & Qt::ALT) == Qt::ALT) - ret |= NSAlternateKeyMask; + ret |= NSEventModifierFlagOption; if ((accel_key & Qt::SHIFT) == Qt::SHIFT) - ret |= NSShiftKeyMask; + ret |= NSEventModifierFlagShift; return ret; } @@ -343,7 +343,7 @@ NSMenuItem *QCocoaMenuItem::sync() #endif { m_native.keyEquivalent = @""; - m_native.keyEquivalentModifierMask = NSCommandKeyMask; + m_native.keyEquivalentModifierMask = NSEventModifierFlagCommand; } NSImage *img = nil; |