diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-06-16 11:58:29 (GMT) |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2014-09-01 15:49:07 (GMT) |
commit | 997d626173d9aba5b01b35e4d95ad162771ba789 (patch) | |
tree | 774c1b814c9f933d32a58a2c42183a438eca7d15 /src/gui/util | |
parent | 93c137ea29f011a267e22fa644a40aba6e3e2d22 (diff) | |
download | Qt-997d626173d9aba5b01b35e4d95ad162771ba789.zip Qt-997d626173d9aba5b01b35e4d95ad162771ba789.tar.gz Qt-997d626173d9aba5b01b35e4d95ad162771ba789.tar.bz2 |
Replace all ocurrences of NSApp with [NSApplication sharedApplication].
The former returns an id and the latter returns an NSApplication*. This
gives us the benefits of static typing and resolves a build error on
OS X 10.10.
Task-number: QTBUG-39644
Change-Id: I62939b168f391beb846f8a1c5ae789e45bceb858
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qsystemtrayicon_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index 3d7ca14..07e3ea2 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -536,7 +536,7 @@ private: #ifndef QT_MAC_USE_COCOA const short scale = GetMBarHeight(); #else - const short scale = [[NSApp mainMenu] menuBarHeight]; + const short scale = [[[NSApplication sharedApplication] mainMenu] menuBarHeight]; #endif NSImage *nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(icon.pixmap(QSize(scale, scale)))); [item setImage: nsimage]; |