diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 16:09:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 16:09:00 (GMT) |
| commit | b9f9d811cfb71ab2983f25f3514da958e444de4b (patch) | |
| tree | 40b0f8571a98ffa6377adb075256e300652343e7 /src/gui/widgets/qmainwindowlayout.cpp | |
| parent | b205fca78bcede0b2eefc8c0b12fed040e77eff1 (diff) | |
| parent | 3d27a19ca009836b812b59c3359db1369d391181 (diff) | |
| download | Qt-b9f9d811cfb71ab2983f25f3514da958e444de4b.zip Qt-b9f9d811cfb71ab2983f25f3514da958e444de4b.tar.gz Qt-b9f9d811cfb71ab2983f25f3514da958e444de4b.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
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 d4afe07..8880ca9 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -1699,6 +1699,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 { |