diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-02-23 14:08:26 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-02-23 15:28:36 (GMT) |
| commit | cf13f99d32df6c42c5d421da41ef35e815fb46ac (patch) | |
| tree | 9a86876c54ac49c7b633407c8f7a416507ffe658 /src/gui/widgets/qmainwindow.cpp | |
| parent | 78c5c1cae5f9e100bfb7388f68208406f0db4b42 (diff) | |
| parent | 0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff) | |
| download | Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.zip Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.gz Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.bz2 | |
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 214cf05..43d6796 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1516,11 +1516,6 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set) if (!isWindow() || d->useHIToolBar == set || QSysInfo::MacintoshVersion < QSysInfo::MV_10_3) return; - // ### Disable when using alien widgets - if (testAttribute(Qt::WA_NativeWindow) == false) { - return; - } - d->useHIToolBar = set; createWinId(); // We need the hiview for down below. |