diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-04-28 06:57:23 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-04-28 06:57:23 (GMT) |
| commit | 9a17e2ac3f9654f7f328aeae5673cff1254517ae (patch) | |
| tree | 2b9d4bede4c9caabca5eb14b0906fd481f2a1e38 /src/gui/dialogs | |
| parent | 001d46dffc6240da27634ef9e27b47f768587253 (diff) | |
| download | Qt-9a17e2ac3f9654f7f328aeae5673cff1254517ae.zip Qt-9a17e2ac3f9654f7f328aeae5673cff1254517ae.tar.gz Qt-9a17e2ac3f9654f7f328aeae5673cff1254517ae.tar.bz2 | |
Fixed wrong menu showing up on S60 while launching a dialog.
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index b0aa7b6..ef562f4 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -67,7 +67,9 @@ extern bool qt_wince_is_smartphone(); //is defined in qguifunctions_wce.cpp #elif defined(Q_WS_S60) # include "qfiledialog.h" #endif - +#if defined(Q_OS_SYMBIAN) +#include "qmenubar.h" +#endif #ifndef SPI_GETSNAPTODEFBUTTON # define SPI_GETSNAPTODEFBUTTON 95 #endif @@ -488,6 +490,14 @@ int QDialog::exec() #endif //QT_NO_MENUBAR #endif //Q_OS_WINCE_WM +#ifdef Q_OS_SYMBIAN +#ifndef QT_NO_MENUBAR + QMenuBar *menuBar = 0; + if (!findChild<QMenuBar *>()) + menuBar = new QMenuBar(this); +#endif +#endif + #if !defined(Q_WS_S60) show(); #else @@ -520,6 +530,13 @@ int QDialog::exec() delete menuBar; #endif //QT_NO_MENUBAR #endif //Q_OS_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; } |