summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qsystemtrayicon_mac.mm
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-05 05:24:23 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-05 05:24:23 (GMT)
commit9f43d4aafeb16c81bc1a161c99dee2df19772e42 (patch)
tree081f5c2323f6fadf49f2d1fada8a7c0cb4bc953c /src/gui/util/qsystemtrayicon_mac.mm
parentf14e3b86e6b7b496017ddd462821325bdb40c779 (diff)
parent7474ad656269aec1352d166bb5a4435086d48482 (diff)
downloadQt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.zip
Qt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.tar.gz
Qt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/util/qsystemtrayicon_mac.mm')
-rw-r--r--src/gui/util/qsystemtrayicon_mac.mm13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm
index ae805f6..0265a83 100644
--- a/src/gui/util/qsystemtrayicon_mac.mm
+++ b/src/gui/util/qsystemtrayicon_mac.mm
@@ -569,16 +569,3 @@ private:
}
@end
-
-/* Done here because this is the only .mm for now! -Sam */
-QMacCocoaAutoReleasePool::QMacCocoaAutoReleasePool()
-{
- NSApplicationLoad();
- pool = (void*)[[NSAutoreleasePool alloc] init];
-}
-
-QMacCocoaAutoReleasePool::~QMacCocoaAutoReleasePool()
-{
- [(NSAutoreleasePool*)pool release];
-}
-