diff options
| author | James Turner <james.turner@kdab.com> | 2012-02-27 13:04:45 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-19 01:45:04 +0200 |
| commit | 1f55af8e54dc4841441ab1adf7759baace9452fa (patch) | |
| tree | 42beff251511100aad43ad31fdb276d67b43e59f /src/plugins/platforms/cocoa/qcocoatheme.mm | |
| parent | 864e9963843f209f61c72123df05743bcbf1e139 (diff) | |
QPA menu abstraction, originally based on Morten's work
Create a QPA abstraction for native menus, derived from the
Cocoa support in 4.8, but with the expectation to support
other platforms too. Update the QtWidget QMenu and QMenuBar
code to maintain their QPA equivalents if they exist.
Change-Id: Id605de3da8811dc832bf48b35f9107778ad320ff
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoatheme.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index d17ee30096..cfb146ad45 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -41,7 +41,8 @@ #include "qcocoatheme.h" -#include "qmenu_mac.h" +#include <QVariant> + #include "qcocoacolordialoghelper.h" #include "qcocoafiledialoghelper.h" #include "qcocoafontdialoghelper.h" @@ -62,17 +63,6 @@ QCocoaTheme::~QCocoaTheme() delete m_systemPalette; } -QPlatformMenu *QCocoaTheme::createPlatformMenu(QMenu *menu) const -{ - return new QCocoaMenu(menu); -} - -QPlatformMenuBar *QCocoaTheme::createPlatformMenuBar(QMenuBar *menuBar) const -{ - return new QCocoaMenuBar(menuBar); -} - - bool QCocoaTheme::usePlatformNativeDialog(DialogType dialogType) const { if (dialogType == QPlatformTheme::FileDialog) |