summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2010-10-20 11:31:27 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-10-20 11:31:27 (GMT)
commit98b931a841f284051a2e22de412701bd2c4f4a76 (patch)
tree67e80613bff14bfd7a3c5e0f77afea8aba6ba81c /src
parent05a0b538e44902505ef0aed434b1dca52439a40a (diff)
downloadQt-98b931a841f284051a2e22de412701bd2c4f4a76.zip
Qt-98b931a841f284051a2e22de412701bd2c4f4a76.tar.gz
Qt-98b931a841f284051a2e22de412701bd2c4f4a76.tar.bz2
Fix autotest failure with experimental client deco
The menu bar is in the outer layout, not the inner one
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index d971f61..2731182 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -504,7 +504,7 @@ void QMainWindow::setToolButtonStyle(Qt::ToolButtonStyle toolButtonStyle)
*/
QMenuBar *QMainWindow::menuBar() const
{
- QMenuBar *menuBar = qobject_cast<QMenuBar *>(d_func()->layout->menuBar());
+ QMenuBar *menuBar = qobject_cast<QMenuBar *>(layout()->menuBar());
if (!menuBar) {
QMainWindow *self = const_cast<QMainWindow *>(this);
menuBar = new QMenuBar(self);