diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-12 07:52:43 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-12 07:52:43 (GMT) |
| commit | 6eb4a47a56914ca65d11736af5c0d758755d0291 (patch) | |
| tree | beec5d53cbae295b119752883697ebf6618d07be /src/gui/widgets/qmenubar.cpp | |
| parent | 4592301363ad625e583b76b2f46f616486e5d0d6 (diff) | |
| download | Qt-6eb4a47a56914ca65d11736af5c0d758755d0291.zip Qt-6eb4a47a56914ca65d11736af5c0d758755d0291.tar.gz Qt-6eb4a47a56914ca65d11736af5c0d758755d0291.tar.bz2 | |
Added symbian specific ifdefs and checks so that QMenuBar doesn't
return inappropriate sizehints when native menubar is used
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index b6ce76b..d05323d 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1648,6 +1648,8 @@ QSize QMenuBar::minimumSizeHint() const const bool as_gui_menubar = !d->mac_menubar; #elif defined (Q_OS_WINCE) const bool as_gui_menubar = !d->wce_menubar; +#elif defined (Q_OS_SYMBIAN) + const bool as_gui_menubar = !d->symbian_menubar; #else const bool as_gui_menubar = true; #endif @@ -1708,6 +1710,8 @@ QSize QMenuBar::sizeHint() const const bool as_gui_menubar = !d->mac_menubar; #elif defined (Q_OS_WINCE) const bool as_gui_menubar = !d->wce_menubar; +#elif defined (Q_OS_SYMBIAN) + const bool as_gui_menubar = !d->symbian_menubar; #else const bool as_gui_menubar = true; #endif @@ -1771,6 +1775,8 @@ int QMenuBar::heightForWidth(int) const const bool as_gui_menubar = !d->mac_menubar; #elif defined (Q_OS_WINCE) const bool as_gui_menubar = !d->wce_menubar; +#elif defined (Q_OS_SYMBIAN) + const bool as_gui_menubar = !d->symbian_menubar; #else const bool as_gui_menubar = true; #endif |