diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-11 17:57:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-11 17:57:06 (GMT) |
| commit | 4889729b32b30a4bad90a0add8ca444529dea2e7 (patch) | |
| tree | 86b67f93e6dcf7d38e10d54c4cce55f33c989b6b /src | |
| parent | 935d4fc9504af2696f7d91b2074290b02f811da8 (diff) | |
| parent | b554326134bab9ec0a9d8592c3052640ababd5cc (diff) | |
| download | Qt-4889729b32b30a4bad90a0add8ca444529dea2e7.zip Qt-4889729b32b30a4bad90a0add8ca444529dea2e7.tar.gz Qt-4889729b32b30a4bad90a0add8ca444529dea2e7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: Fixup wrong code in patch baaa5ae
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index aca1d53..8784ffd 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2830,7 +2830,7 @@ void QWidgetPrivate::setSubWindowStacking(bool set) if ([pwin isVisible] && (ptype == Qt::Window || ptype == Qt::Dialog) && ![qwin parentWindow] - && (!use_behaviour_qt473 && parent->windowModality() == Qt::ApplicationModal)) { + && (use_behaviour_qt473 || parent->windowModality() == Qt::ApplicationModal)) { NSInteger level = [qwin level]; [pwin addChildWindow:qwin ordered:NSWindowAbove]; if ([qwin level] < level) |