diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-06 13:57:26 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-06 13:57:26 (GMT) |
| commit | 91ffeeb342ce85dbd24f49c45adce5cb21a973a4 (patch) | |
| tree | c479fb021e2613c32f1de9e6f7abbc5887dc5425 /src/gui/widgets/qmainwindow.cpp | |
| parent | 1560af4bca4a7ea2dd6b73ddef60cd012c4897b0 (diff) | |
| parent | f2123c9bbbe6468eaa6ab2b578ae0352094aa708 (diff) | |
| download | Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.zip Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.tar.gz Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 2abc9e8..502c1e9 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -480,9 +480,6 @@ void QMainWindow::setMenuBar(QMenuBar *menuBar) oldMenuBar->hide(); oldMenuBar->deleteLater(); } -#ifdef Q_OS_WINCE - if (menuBar && menuBar->size().height() > 0) -#endif d->layout->setMenuBar(menuBar); } |