path: root/src/widgets/widgets/qmenubar_p.h
diff options
authorJan Arve Saether <>2012-10-22 13:48:59 +0200
committerThe Qt Project <>2012-10-29 20:27:27 +0100
commitc360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa (patch)
treeebbd6dffd5315bca9016209089f041c4e222db8b /src/widgets/widgets/qmenubar_p.h
parent63e451194e9f736fe4e35abd6a2a68c507ec9f5f (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 <> Reviewed-by: Janne Anttila <> Reviewed-by: J-P Nurmi <>
Diffstat (limited to 'src/widgets/widgets/qmenubar_p.h')
1 files changed, 0 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
index 4960c60f83..0f08a4e414 100644
--- a/src/widgets/widgets/qmenubar_p.h
+++ b/src/widgets/widgets/qmenubar_p.h
@@ -188,9 +188,6 @@ public:
void wceRefresh();
bool wceEmitSignals(QList<QWceMenuAction*> actions, uint command);
- QAction *menuBarAction;
#endif // QT_NO_MENUBAR