diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-12-16 23:36:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 07:54:18 +0100 |
| commit | e1330ecfdccf75c3c3f93734e7950199918e6ad7 (patch) | |
| tree | 795851c951ee32e367561724aaaec014943fc44b /src/widgets/widgets/qtoolbarlayout.cpp | |
| parent | ba507f66906b4e4b57977fe3661d21912d0aec45 (diff) | |
Mac: Remove old unified toolbar implementation.
This has been dead code in Qt 5 since WS_MAC isn't
defined any more.
The new implementation is far less intrusive and does
not require a separate layout.
Task-number: QTBUG-34411
Change-Id: I91bf2294086cb7334a0f56eb1bb97464d8d7b2e3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/widgets/widgets/qtoolbarlayout.cpp')
| -rw-r--r-- | src/widgets/widgets/qtoolbarlayout.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 3c0c84ee2f..fe919feba9 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -333,20 +333,6 @@ void QToolBarLayout::updateGeomArray() const rpick(o, that->hint) += handleExtent; that->hint += QSize(2*margin, 2*margin); that->dirty = false; -#ifdef Q_WS_MAC - if (QMainWindow *mw = qobject_cast<QMainWindow *>(parentWidget()->parentWidget())) { - if (mw->unifiedTitleAndToolBarOnMac() - && mw->toolBarArea(static_cast<QToolBar *>(parentWidget())) == Qt::TopToolBarArea) { - if (expandFlag) { - tb->setMaximumSize(0xFFFFFF, 0xFFFFFF); - } else { - tb->setMaximumSize(hint); - } - } - } -#endif - - that->dirty = false; } static bool defaultWidgetAction(QToolBarItem *item) @@ -401,15 +387,6 @@ void QToolBarLayout::setGeometry(const QRect &rect) if (!extension->isHidden()) extension->hide(); } -#ifdef Q_WS_MAC - if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) { - Qt::ToolBarArea area = win->toolBarArea(tb); - if (win->unifiedTitleAndToolBarOnMac() && area == Qt::TopToolBarArea) { - qt_mainwindow_layout(win)->fixSizeInUnifiedToolbar(tb); - } - } -#endif - } bool QToolBarLayout::layoutActions(const QSize &size) |