diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-03-23 09:44:10 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-03-23 09:44:10 (GMT) |
| commit | 47902b7587d66c0941bacf08b31b8caae264f09a (patch) | |
| tree | fc7b9715220274c9fd07254159502bf90c300fe5 /src/gui/dialogs/qdialog.cpp | |
| parent | dd9c26cba63c54358f3309143b76ae0416f89c78 (diff) | |
| parent | 0409cdb406021d8609eb2a88a896f9fbc085805f (diff) | |
| download | Qt-47902b7587d66c0941bacf08b31b8caae264f09a.zip Qt-47902b7587d66c0941bacf08b31b8caae264f09a.tar.gz Qt-47902b7587d66c0941bacf08b31b8caae264f09a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/dialogs/qdialog.cpp')
| -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; } |