diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-03-22 07:48:37 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-03-23 08:37:36 (GMT) |
| commit | 253d075996818ba6d42e0caf9e03271e386621d0 (patch) | |
| tree | 8bec41a23e9bb5e4ca37265304fb175a6c69a846 /src | |
| parent | 03b97ec038a12c8206f57f94fcd08c43614876e9 (diff) | |
| download | Qt-253d075996818ba6d42e0caf9e03271e386621d0.zip Qt-253d075996818ba6d42e0caf9e03271e386621d0.tar.gz Qt-253d075996818ba6d42e0caf9e03271e386621d0.tar.bz2 | |
Fixed left softkey regression caused by 7829fe15 in Symbian.
Dialogs are always responsible for setting all of their softkeys by
themselves, that's why this qmenubar hack can be removed.
When "Options" menu support was moved from QMainWindow to QMenuBar,
it appeared that some dialogs did had "Options" in LSK even it should
have had dialog specific softkey.
This commit removes the year old hack made to qdialogs softkey
implementation.
Reviewed-By: Sami Merila
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index d8ac9a8..25ba016 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -69,7 +69,6 @@ extern bool qt_wince_is_smartphone(); //is defined in qguifunctions_wce.cpp # include "qfontdialog.h" # include "qcolordialog.h" # include "qwizard.h" -# include "qmenubar.h" #endif #if defined(Q_WS_S60) @@ -529,12 +528,6 @@ int QDialog::exec() #endif //Q_WS_WINCE_WM #ifdef Q_OS_SYMBIAN -#ifndef QT_NO_MENUBAR - QMenuBar *menuBar = 0; - if (!findChild<QMenuBar *>()) - menuBar = new QMenuBar(this); -#endif - if (qobject_cast<QFileDialog *>(this) || qobject_cast<QFontDialog *>(this) || qobject_cast<QColorDialog *>(this) || qobject_cast<QWizard *>(this)) showMaximized(); @@ -566,13 +559,6 @@ int QDialog::exec() delete menuBar; #endif //QT_NO_MENUBAR #endif //Q_WS_WINCE_WM -#ifdef Q_OS_SYMBIAN -#ifndef QT_NO_MENUBAR - else if (menuBar) - delete menuBar; -#endif //QT_NO_MENUBAR -#endif //Q_OS_SYMBIAN - return res; } |