diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-13 19:36:51 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-07 11:49:27 +0200 |
commit | d7fc2fb5c666e58facfa15e64551a80dfda2c9d2 (patch) | |
tree | 4140e6e5cebb26a7820dd31f92286f504422d371 /src/plugins/platforms/cocoa/qcocoanativeinterface.mm | |
parent | 7ad5c5346f3298d90f12531231cd021768f1fb26 (diff) |
macOS: Remove QMenu indirection via QPlatformNativeInterface
Task-number: QTBUG-83252
Change-Id: I0c750d2b1912ced343d96ea0ca081c3319be2889
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoanativeinterface.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 77187f2d20..3b11afa8a3 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -102,12 +102,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter return NativeResourceForIntegrationFunction(QCocoaNativeInterface::removeFromMimeList); if (resource.toLower() == "registerdraggedtypes") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerDraggedTypes); - if (resource.toLower() == "setdockmenu") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setDockMenu); - if (resource.toLower() == "qmenutonsmenu") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qMenuToNSMenu); - if (resource.toLower() == "qmenubartonsmenu") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qMenuBarToNSMenu); if (resource.toLower() == "registertouchwindow") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerTouchWindow); if (resource.toLower() == "setembeddedinforeignview") @@ -189,28 +183,6 @@ void QCocoaNativeInterface::registerDraggedTypes(const QStringList &types) qt_mac_registerDraggedTypes(types); } -void QCocoaNativeInterface::setDockMenu(QPlatformMenu *platformMenu) -{ - QMacAutoReleasePool pool; - QCocoaMenu *cocoaPlatformMenu = static_cast<QCocoaMenu *>(platformMenu); - NSMenu *menu = cocoaPlatformMenu->nsMenu(); - [QCocoaApplicationDelegate sharedDelegate].dockMenu = menu; -} - -void *QCocoaNativeInterface::qMenuToNSMenu(QPlatformMenu *platformMenu) -{ - QCocoaMenu *cocoaPlatformMenu = static_cast<QCocoaMenu *>(platformMenu); - NSMenu *menu = cocoaPlatformMenu->nsMenu(); - return reinterpret_cast<void *>(menu); -} - -void *QCocoaNativeInterface::qMenuBarToNSMenu(QPlatformMenuBar *platformMenuBar) -{ - QCocoaMenuBar *cocoaPlatformMenuBar = static_cast<QCocoaMenuBar *>(platformMenuBar); - NSMenu *menu = cocoaPlatformMenuBar->nsMenu(); - return reinterpret_cast<void *>(menu); -} - void QCocoaNativeInterface::setEmbeddedInForeignView(QPlatformWindow *window, bool embedded) { Q_UNUSED(embedded); // "embedded" state is now automatically detected |