diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-27 12:21:28 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-27 12:21:28 (GMT) |
| commit | e6f17306949adf10dd2845880c60346674fc1504 (patch) | |
| tree | fe155dc95e0130f3c9b5dd17f0c4ccc7fb2a5ca4 /src/gui | |
| parent | c9691c62b62c656a9a153b8879f13a5ce71a6d2d (diff) | |
| parent | 7461ed5227e3002c4a6f74d458aa0255b7c1217d (diff) | |
| download | Qt-e6f17306949adf10dd2845880c60346674fc1504.zip Qt-e6f17306949adf10dd2845880c60346674fc1504.tar.gz Qt-e6f17306949adf10dd2845880c60346674fc1504.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1:
Optimise QStringList::join by pre-allocating the final size.
Remove test binary left behind
Whitespace cleanup
cleanups & styling fixes
QFileInfo: Implement additional caching of FileOwner strings
qfileinfo_p.h: removed unnecessary dependency on QFSFileEngine
Simplify QFileInfoPrivate::getFileTime
QFileInfo: Don't re-stat files, when in caching mode
QFileInfoPrivate::Data: don't call clear() from constructors
fix regression introduced in 44766d2
Remove the tests/auto/networkdata dir, since this causes the maketestselftest test fail
Add proper license headers to these files.
Cocoa: qfiledialog test spits out memory warnings
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index e0dcaef..13c25fd 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -143,6 +143,9 @@ extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp void macWindowFade(void * /*OSWindowRef*/ window, float durationSeconds) { +#ifdef QT_MAC_USE_COCOA + QMacCocoaAutoReleasePool pool; +#endif OSWindowRef wnd = static_cast<OSWindowRef>(window); if (wnd) { QWidget *widget; |