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, 13 insertions, 21 deletions

diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index cf2d0de0e2..5f0a1e84b0 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -1322,26 +1322,18 @@ void tst_QMainWindow::createPopupMenu()
         mainwindow.addDockWidget(Qt::LeftDockWidgetArea, &dockwidget4);
 
 
-#ifdef QT_SOFTKEYS_ENABLED
-        // Softkeys add extra "Select" and "Back" actions to menu by default.
-        // Two first actions will be Select and Back when softkeys are enabled
-        int numSoftkeyActions = 2;
-#else
-        int numSoftkeyActions = 0;
-#endif
-
         QMenu *menu = mainwindow.createPopupMenu();
         QVERIFY(menu != 0);
         QList<QAction *> actions = menu->actions();
-        QCOMPARE(actions.size(), 7 + numSoftkeyActions);
+        QCOMPARE(actions.size(), 7);
 
-        QCOMPARE(actions.at(0 + numSoftkeyActions), dockwidget1.toggleViewAction());
-        QCOMPARE(actions.at(1 + numSoftkeyActions), dockwidget2.toggleViewAction());
-        QCOMPARE(actions.at(2 + numSoftkeyActions), dockwidget3.toggleViewAction());
-        QCOMPARE(actions.at(3 + numSoftkeyActions), dockwidget4.toggleViewAction());
-        QVERIFY(actions.at(4 + numSoftkeyActions)->isSeparator());
-        QCOMPARE(actions.at(5 + numSoftkeyActions), toolbar1.toggleViewAction());
-        QCOMPARE(actions.at(6 + numSoftkeyActions), toolbar2.toggleViewAction());
+        QCOMPARE(actions.at(0), dockwidget1.toggleViewAction());
+        QCOMPARE(actions.at(1), dockwidget2.toggleViewAction());
+        QCOMPARE(actions.at(2), dockwidget3.toggleViewAction());
+        QCOMPARE(actions.at(3), dockwidget4.toggleViewAction());
+        QVERIFY(actions.at(4)->isSeparator());
+        QCOMPARE(actions.at(5), toolbar1.toggleViewAction());
+        QCOMPARE(actions.at(6), toolbar2.toggleViewAction());
 
         delete menu;
 
@@ -1352,12 +1344,12 @@ void tst_QMainWindow::createPopupMenu()
         menu = mainwindow.createPopupMenu();
         QVERIFY(menu != 0);
         actions = menu->actions();
-        QCOMPARE(actions.size(), 4 + numSoftkeyActions);
+        QCOMPARE(actions.size(), 4);
 
-        QCOMPARE(actions.at(0 + numSoftkeyActions), dockwidget2.toggleViewAction());
-        QCOMPARE(actions.at(1 + numSoftkeyActions), dockwidget3.toggleViewAction());
-        QVERIFY(actions.at(2 + numSoftkeyActions)->isSeparator());
-        QCOMPARE(actions.at(3 + numSoftkeyActions), toolbar2.toggleViewAction());
+        QCOMPARE(actions.at(0), dockwidget2.toggleViewAction());
+        QCOMPARE(actions.at(1), dockwidget3.toggleViewAction());
+        QVERIFY(actions.at(2)->isSeparator());
+        QCOMPARE(actions.at(3), toolbar2.toggleViewAction());
 
         delete menu;
     }