diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
| commit | c072fa8fdd0cebcaff9062e07d4623bbd7aded3c (patch) | |
| tree | db35223ec643fbc5aeadcfab4112e5686ff44b8f /src/gui/kernel/qapplication_mac.mm | |
| parent | bf54d63fb1b60ad899d0b14889109278bd04fd9d (diff) | |
| parent | 9a83bf2676dabdf36f9ca491b480b50d8e7ed93d (diff) | |
| download | Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.zip Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.gz Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/kernel/qapplication_mac.mm')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 3fba833..0199e87 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -1237,7 +1237,7 @@ void qt_init(QApplicationPrivate *priv, int) // Cocoa application delegate #ifdef QT_MAC_USE_COCOA - NSApplication *cocoaApp = [NSApplication sharedApplication]; + NSApplication *cocoaApp = [QNSApplication sharedApplication]; QMacCocoaAutoReleasePool pool; NSObject *oldDelegate = [cocoaApp delegate]; QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate]; |