From c360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Mon, 22 Oct 2012 13:48:59 +0200 Subject: 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 --- examples/widgets/widgets/wiggly/dialog.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'examples/widgets/widgets/wiggly') diff --git a/examples/widgets/widgets/wiggly/dialog.cpp b/examples/widgets/widgets/wiggly/dialog.cpp index fb18997a9a..4389159d1f 100644 --- a/examples/widgets/widgets/wiggly/dialog.cpp +++ b/examples/widgets/widgets/wiggly/dialog.cpp @@ -56,17 +56,6 @@ Dialog::Dialog(QWidget *parent, bool smallScreen) layout->addWidget(lineEdit); setLayout(layout); -#ifdef QT_SOFTKEYS_ENABLED - QAction *exitAction = new QAction(tr("Exit"), this); - exitAction->setSoftKeyRole(QAction::NegativeSoftKey); - connect (exitAction, SIGNAL(triggered()),this, SLOT(close())); - addAction (exitAction); - - Qt::WindowFlags flags = windowFlags(); - flags |= Qt::WindowSoftkeysVisibleHint; - setWindowFlags(flags); -#endif - connect(lineEdit, SIGNAL(textChanged(QString)), wigglyWidget, SLOT(setText(QString))); if (!smallScreen){ -- cgit v1.2.3