diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 18:39:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 18:39:02 (GMT) |
| commit | f6d9a717946422d910ec9e680197617eb706410c (patch) | |
| tree | aa352c7e64efc5e22e27e1e336d3baeed3ce916d /src/gui/widgets/qmainwindowlayout.cpp | |
| parent | 150df2037f392225771f94b39f7a340d7c154de7 (diff) | |
| parent | b7b9a22ce263fcb430ff4228fb88ca5229a6e226 (diff) | |
| download | Qt-f6d9a717946422d910ec9e680197617eb706410c.zip Qt-f6d9a717946422d910ec9e680197617eb706410c.tar.gz Qt-f6d9a717946422d910ec9e680197617eb706410c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Clear confusion between QMainWindow and QMainWindowLayout.
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index 6bc07e1..51267c1 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -1695,6 +1695,7 @@ QMainWindowLayout::QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLay , gapIndicator(new QRubberBand(QRubberBand::Rectangle, mainwindow)) #endif //QT_NO_RUBBERBAND #ifdef Q_WS_MAC + , activateUnifiedToolbarAfterFullScreen(false) , blockVisiblityCheck(false) #endif { |