diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:44:20 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:48:55 +0100 |
| commit | e2a546a18be88f380b3d9d3efbed390fe1a9e93f (patch) | |
| tree | f7a6a0c7a60ee7b771ee9d6256c385f761113135 /src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | |
| parent | 0be8f59d725d4a5e79709487e3aac1d351a6c04c (diff) | |
| parent | 99b89d30fa5484c5d1f3cbda828648c28af4fb7d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I896b0cf54f317c4336cc3d3db319a0b89e421728
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm index 13e9d8809e..e756f0aeb0 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm @@ -289,9 +289,6 @@ void QCocoaSystemTrayIcon::showMessage(const QString &title, const QString &mess } QT_END_NAMESPACE -@implementation NSStatusItem (Qt) -@end - @implementation QNSImageView -(id)initWithParent:(QNSStatusItem*)myParent { self = [super init]; |