diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-09-29 14:29:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-10 07:47:58 +0200 |
| commit | 9fa6e8f627d0c61fd5a3b993903a362dc04bf707 (patch) | |
| tree | 56858ef0994ef4b300d5f6928fa51b0844bf1861 /src/widgets/widgets/qtoolbarlayout.cpp | |
| parent | 33233ca3e3d79152744eedd353106c5d95737e00 (diff) | |
Clean-up a macro for Cocoa
Remove the usage of Q_MAC_USE_COCOA and Carbon code paths.
Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112
Reviewed-on: http://codereview.qt-project.org/5100
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qtoolbarlayout.cpp')
| -rw-r--r-- | src/widgets/widgets/qtoolbarlayout.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 971fddaafd..ac9be12ee2 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -402,15 +402,12 @@ void QToolBarLayout::setGeometry(const QRect &rect) extension->hide(); } #ifdef Q_WS_MAC - // Nothing to do for Carbon... probably -# ifdef QT_MAC_USE_COCOA 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 #endif } |