diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 21:39:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 21:39:58 (GMT) |
| commit | c59b63b22b60846e9602e1727a254ea482096f04 (patch) | |
| tree | 109418f1f868150512fcbbb8fc6311dce7a2230e /src/gui/widgets/qmainwindow.cpp | |
| parent | 69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73 (diff) | |
| parent | db736d1caef7c492437e61654775767449b530e5 (diff) | |
| download | Qt-c59b63b22b60846e9602e1727a254ea482096f04.zip Qt-c59b63b22b60846e9602e1727a254ea482096f04.tar.gz Qt-c59b63b22b60846e9602e1727a254ea482096f04.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: non-native toolbar shows in window when hidden
Cocoa: disable scroll optimization for certain cases
Cocoa: fix scroll optimization bug
Cocoa: add scroll optimization when scrolling both hor and ver
Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4
Cocoa: remove compiler warning
Add support for disabling touch on to enhance scrolling in Cocoa
Cocoa/Alien: replace depricated API
Cocoa/Alien: remove unneded code for scrolling with alien
Cocoa/Alien: keep the scrolling within correct bounds
Cocoa/Alien: bugfix scrolling, dirty region issue
Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets
Cocoa: enable more autotests for qwidget as a result of Alien
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine
Alien implementation for the Cocoa port
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index a786e2f..fd61783 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -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. |