Do the actual removal of the Soft Keys API and related code
authorJan Arve Saether <jan-arve.saether@digia.com>
Mon, 22 Oct 2012 11:48:59 +0000 (13:48 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 29 Oct 2012 19:27:27 +0000 (20:27 +0100)
commitc360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa
treeebbd6dffd5315bca9016209089f041c4e222db8b
parent63e451194e9f736fe4e35abd6a2a68c507ec9f5f
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>
39 files changed:
dist/changes-5.0.0
examples/widgets/widgets/softkeys/main.cpp [deleted file]
examples/widgets/widgets/softkeys/softkeys.cpp [deleted file]
examples/widgets/widgets/softkeys/softkeys.desktop [deleted file]
examples/widgets/widgets/softkeys/softkeys.h [deleted file]
examples/widgets/widgets/softkeys/softkeys.pro [deleted file]
examples/widgets/widgets/wiggly/dialog.cpp
src/corelib/global/qfeatures.h
src/corelib/global/qfeatures.txt
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qcoreevent.h
src/widgets/dialogs/qdialog.cpp
src/widgets/dialogs/qerrormessage.cpp
src/widgets/dialogs/qprogressdialog.cpp
src/widgets/dialogs/qwizard.cpp
src/widgets/itemviews/qabstractitemview.cpp
src/widgets/itemviews/qabstractitemview_p.h
src/widgets/kernel/kernel.pri
src/widgets/kernel/qaction.cpp
src/widgets/kernel/qaction.h
src/widgets/kernel/qaction_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qsoftkeymanager.cpp [deleted file]
src/widgets/kernel/qsoftkeymanager_common_p.h [deleted file]
src/widgets/kernel/qsoftkeymanager_p.h [deleted file]
src/widgets/kernel/qwidget.cpp
src/widgets/statemachine/qguistatemachine.cpp
src/widgets/widgets/qcombobox.cpp
src/widgets/widgets/qcombobox_p.h
src/widgets/widgets/qdialogbuttonbox.cpp
src/widgets/widgets/qmenu.cpp
src/widgets/widgets/qmenubar.cpp
src/widgets/widgets/qmenubar_p.h
tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp