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>

1 files changed, 0 insertions, 37 deletions

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 07dab9e784..2feb797985 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -77,7 +77,6 @@
 #include "private/qstylesheetstyle_p.h"
 #include "private/qstyle_p.h"
 #include "qfileinfo.h"
-#include "private/qsoftkeymanager_p.h"
 #include <QtGui/qinputmethod.h>
 
 #include <private/qgraphicseffect_p.h>
@@ -906,30 +905,6 @@ void QWidget::setAutoFillBackground(bool enabled)
 
     \sa QEvent, QPainter, QGridLayout, QBoxLayout
 
-    \section1 Softkeys
-
-    Since Qt 4.6, Softkeys are usually physical keys on a device that have a corresponding label or
-    other visual representation on the screen that is generally located next to its
-    physical counterpart. They are most often found on mobile phone platforms. In
-    modern touch based user interfaces it is also possible to have softkeys that do
-    not correspond to any physical keys. Softkeys differ from other onscreen labels
-    in that they are contextual.
-
-    In Qt, contextual softkeys are added to a widget by calling addAction() and
-    passing a \c QAction with a softkey role set on it. When the widget
-    containing the softkey actions has focus, its softkeys should appear in
-    the user interface. Softkeys are discovered by traversing the widget
-    hierarchy so it is possible to define a single set of softkeys that are
-    present at all times by calling addAction() for a given top level widget.
-
-    On some platforms, this concept overlaps with \c QMenuBar such that if no
-    other softkeys are found and the top level widget is a QMainWindow containing
-    a QMenuBar, the menubar actions may appear on one of the softkeys.
-
-    Note: Currently softkeys are only supported on the Symbian Platform.
-
-    \sa addAction(), QAction, QMenuBar
-
 */
 
 QWidgetMapper *QWidgetPrivate::mapper = 0;          // widget with wid
@@ -7956,9 +7931,6 @@ bool QWidget::event(QEvent *event)
         }
         break;
     case QEvent::FocusIn:
-#ifdef QT_SOFTKEYS_ENABLED
-        QSoftKeyManager::updateSoftKeys();
-#endif
         focusInEvent((QFocusEvent*)event);
         d->updateWidgetTransform();
         break;
@@ -8109,12 +8081,6 @@ bool QWidget::event(QEvent *event)
             if (w && w->isVisible() && !w->isWindow())
                 QApplication::sendEvent(w, event);
         }
-
-#ifdef QT_SOFTKEYS_ENABLED
-        if (isWindow())
-            QSoftKeyManager::updateSoftKeys();
-#endif
-
         break; }
 
     case QEvent::LanguageChange:
@@ -8199,9 +8165,6 @@ bool QWidget::event(QEvent *event)
     case QEvent::ActionAdded:
     case QEvent::ActionRemoved:
     case QEvent::ActionChanged:
-#ifdef QT_SOFTKEYS_ENABLED
-        QSoftKeyManager::updateSoftKeys();
-#endif
         actionEvent((QActionEvent*)event);
         break;
 #endif