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/widgets/kernel/qaction.h | |
| 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/widgets/kernel/qaction.h')
| -rw-r--r-- | src/widgets/kernel/qaction.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index bb7de852c1..ea3138fb23 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -90,7 +90,8 @@ class Q_WIDGETS_EXPORT QAction : public QObject Q_PROPERTY(Priority priority READ priority WRITE setPriority) public: - enum MenuRole { NoRole, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole, + // note this is copied into qplatformmenu.h, which must stay in sync + enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole, AboutRole, PreferencesRole, QuitRole }; enum SoftKeyRole { NoSoftKey, PositiveSoftKey, NegativeSoftKey, SelectSoftKey }; |