2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
index 6779bda491..738c40aba6 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h
@@ -65,7 +65,7 @@ public:
     void updateMenu(QPlatformMenu *menu) override;
     QRect geometry() const override;
     void showMessage(const QString &title, const QString &msg,
-                     const QIcon& icon, MessageIcon iconType, int secs) override;
+                     const QIcon& icon, MessageIcon iconType, int msecs) override;
 
     bool isSystemTrayAvailable() const override;
     bool supportsMessages() const override;
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
index a5b42ac4e3..559188aa5f 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -265,7 +265,7 @@ bool QCocoaSystemTrayIcon::supportsMessages() const
 }
 
 void QCocoaSystemTrayIcon::showMessage(const QString &title, const QString &message,
-                                       const QIcon& icon, MessageIcon, int)
+                                       const QIcon& icon, MessageIcon, int msecs)
 {
     if (!m_sys)
         return;
@@ -283,6 +283,10 @@ void QCocoaSystemTrayIcon::showMessage(const QString &title, const QString &mess
     NSUserNotificationCenter *center = NSUserNotificationCenter.defaultUserNotificationCenter;
     center.delegate = m_sys->item;
     [center deliverNotification:notification];
+    if (msecs) {
+        NSTimeInterval timeout = msecs / 1000.0;
+        [center performSelector:@selector(removeDeliveredNotification:) withObject:notification afterDelay:timeout];
+    }
     [notification release];
 }
 QT_END_NAMESPACE
@@ -435,8 +439,7 @@ QT_END_NAMESPACE
 }
 
 - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
-    Q_UNUSED(center);
-    Q_UNUSED(notification);
+    [center removeDeliveredNotification:notification];
     emit systray->messageClicked();
 }