diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-04 14:20:29 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-04 14:20:29 (GMT) |
| commit | ad227d0b009860c2b30eb40b5262519e2eb5055d (patch) | |
| tree | 4425de806449e7acf72f28529920eac1b0ae53b5 /src | |
| parent | 22bc54c21cc63b781be736de71d27836c67dc4ff (diff) | |
| parent | bc1ca85d59e680d6b4f5374775a7a7278650c8a9 (diff) | |
| download | Qt-ad227d0b009860c2b30eb40b5262519e2eb5055d.zip Qt-ad227d0b009860c2b30eb40b5262519e2eb5055d.tar.gz Qt-ad227d0b009860c2b30eb40b5262519e2eb5055d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 0213af9..69f1353 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3671,6 +3671,7 @@ void QWidgetPrivate::raise_sys() return; #if QT_MAC_USE_COCOA + QMacCocoaAutoReleasePool pool; if (isRealWindow()) { // Calling orderFront shows the window on Cocoa too. if (!q->testAttribute(Qt::WA_DontShowOnScreen) && q->isVisible()) { |