summaryrefslogtreecommitdiffstats
path: root/src/widgets/statemachine
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2012-10-22 13:48:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-29 20:27:27 +0100
commitc360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa (patch)
treeebbd6dffd5315bca9016209089f041c4e222db8b /src/widgets/statemachine
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 <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/statemachine')
-rw-r--r--src/widgets/statemachine/qguistatemachine.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
index fcb3a6df03..8c66ec4051 100644
--- a/src/widgets/statemachine/qguistatemachine.cpp
+++ b/src/widgets/statemachine/qguistatemachine.cpp
@@ -442,9 +442,6 @@ static QEvent *cloneEvent(QEvent *e)
break;
#endif
- case QEvent::UpdateSoftKeys:
- return new QEvent(*e);
-
case QEvent::User:
case QEvent::MaxUser:
Q_ASSERT_X(false, "cloneEvent()", "not implemented");