diff options
Diffstat (limited to 'src/widgets/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 238b8d57c3..014700f389 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -1442,13 +1442,11 @@ bool QMainWindow::event(QEvent *event) // We are coming out of a minimize, leave things as is. d->layout->blockVisiblityCheck = true; } -# ifdef QT_MAC_USE_COCOA // We need to update the HIToolbar status when we go out of or into fullscreen. QWindowStateChangeEvent *wce = static_cast<QWindowStateChangeEvent *>(event); if ((windowState() & Qt::WindowFullScreen) || (wce->oldState() & Qt::WindowFullScreen)) { d->layout->updateHIToolBarStatus(); } -# endif // Cocoa } break; #endif // Q_WS_MAC @@ -1506,16 +1504,13 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set) d->useHIToolBar = set; createWinId(); // We need the hiview for down below. -#ifdef QT_MAC_USE_COCOA // Activate the unified toolbar with the raster engine. if (windowSurface() && set) { d->layout->unifiedSurface = new QUnifiedToolbarSurface(this); } -#endif // QT_MAC_USE_COCOA d->layout->updateHIToolBarStatus(); -#ifdef QT_MAC_USE_COCOA // Deactivate the unified toolbar with the raster engine. if (windowSurface() && !set) { if (d->layout->unifiedSurface) { @@ -1523,7 +1518,6 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set) d->layout->unifiedSurface = 0; } } -#endif // QT_MAC_USE_COCOA // Enabling the unified toolbar clears the opaque size grip setting, update it. d->macUpdateOpaqueSizeGrip(); |