diff options
author | Jan Arve Saether <jan-arve.saether@digia.com> | 2012-10-22 15:09:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-22 22:27:53 +0200 |
commit | ebaed02ae680cf37f014b314baef429a0e642c53 (patch) | |
tree | dafc9fae64590d783c23dc5fc67d344f24af1202 /src/widgets/kernel/qaction.cpp | |
parent | d7b087eaac7cebfcbe5b23935d7d7576e127d844 (diff) |
Remove softkey API, it was only implemented for Symbian.
It is only removed from the documentation for now (I think this should
go in the beta 2).
That should liberate us to be able to change the API if needed for
other platforms that might need a soft keys API.
Once this goes in, the plan is to do the actual cleanup.
Change-Id: I9a7a3eb45597cd013fe3c4bd479ad08a25ef0b9b
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/widgets/kernel/qaction.cpp')
-rw-r--r-- | src/widgets/kernel/qaction.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 70a9ab664e..e835f927d0 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -280,7 +280,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) File menu in your menubar and the File menu has a submenu, setting the MenuRole for the actions in that submenu have no effect. They will never be moved. */ - +#ifndef qdoc /*! \since 4.6 \enum QAction::SoftKeyRole @@ -300,7 +300,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) the action has focus. If no widget currently has focus, the softkey framework will traverse up the widget parent hierarchy looking for a widget containing softkey actions. */ - +#endif /*! Constructs an action with \a parent. If \a parent is an action group the action will be automatically inserted into the group. @@ -1287,6 +1287,7 @@ QAction::MenuRole QAction::menuRole() const return d->menuRole; } +#ifndef qdoc /*! \property QAction::softKeyRole \brief the action's softkey role @@ -1313,7 +1314,7 @@ QAction::SoftKeyRole QAction::softKeyRole() const Q_D(const QAction); return d->softKeyRole; } - +#endif /*! \property QAction::iconVisibleInMenu \brief Whether or not an action should show an icon in a menu |