diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2012-10-22 13:48:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 20:27:27 +0100 |
| commit | c360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa (patch) | |
| tree | ebbd6dffd5315bca9016209089f041c4e222db8b /src/widgets/kernel/qaction.h | |
| parent | 63e451194e9f736fe4e35abd6a2a68c507ec9f5f (diff) | |
Do the actual removal of the Soft Keys API and related code
In addition to the actual removal of the softkeys API in QAction,
this commit removes some enums related to the softkeys feature:
Qt::WA_MergeSoftkeys
Qt::WA_MergeSoftkeysRecursively
It also removes some "zombie" enums:
Qt::WindowSoftkeysVisibleHint = 0x40000000,
Qt::WindowSoftkeysRespondHint = 0x80000000,
(The only implementation that used these were removed when
qapplication_s60.cpp and qwidget_s60.cpp were removed.)
Change-Id: Ib6fc6d543def4757383d5f19256199d9d190c614
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/widgets/kernel/qaction.h')
| -rw-r--r-- | src/widgets/kernel/qaction.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index e149975de7..6a3c0bee68 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -66,9 +66,6 @@ class Q_WIDGETS_EXPORT QAction : public QObject Q_DECLARE_PRIVATE(QAction) Q_ENUMS(MenuRole) -#ifndef qdoc - Q_ENUMS(SoftKeyRole) -#endif Q_ENUMS(Priority) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY changed) Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled) @@ -87,9 +84,6 @@ class Q_WIDGETS_EXPORT QAction : public QObject #endif Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY changed) Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed) -#ifndef qdoc - Q_PROPERTY(SoftKeyRole softKeyRole READ softKeyRole WRITE setSoftKeyRole NOTIFY changed) -#endif Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed) Q_PROPERTY(Priority priority READ priority WRITE setPriority) @@ -97,10 +91,6 @@ public: // note this is copied into qplatformmenu.h, which must stay in sync enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole, AboutRole, PreferencesRole, QuitRole }; -#ifndef qdoc - enum SoftKeyRole { - NoSoftKey, PositiveSoftKey, NegativeSoftKey, SelectSoftKey }; -#endif enum Priority { LowPriority = 0, NormalPriority = 128, HighPriority = 256}; @@ -178,10 +168,6 @@ public: void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; -#ifndef qdoc - void setSoftKeyRole(SoftKeyRole softKeyRole); - SoftKeyRole softKeyRole() const; -#endif void setIconVisibleInMenu(bool visible); bool isIconVisibleInMenu() const; |