From 9e7fa9f72b0f83bff77fffe127bd3b34a8f54aa7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 4 Oct 2013 16:44:42 +0200 Subject: [PATCH] Make QSystemTrayIcon::showMessage invokable Qt WebKit's HTML5 web notifications rely on QSystemTrayIcon::showMessage to be invokable since the lower WebCore components can not link directly to QWidgets. Change-Id: I952de47ed8a90553a8f1ac30256d77ef6014da44 Reviewed-by: Friedemann Kleint Reviewed-by: Simon Hausmann --- src/widgets/util/qsystemtrayicon.cpp | 2 ++ src/widgets/util/qsystemtrayicon.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 08b24a8200d..79ca0a5bdb1 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -380,6 +380,8 @@ bool QSystemTrayIcon::supportsMessages() On Mac OS X, the Growl notification system must be installed for this function to display messages. + Has been turned into a slot in Qt 5.2. + \sa show(), supportsMessages() */ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg, diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 278efae586c..d6ba553a3ab 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -94,8 +94,6 @@ public: static bool supportsMessages(); enum MessageIcon { NoIcon, Information, Warning, Critical }; - void showMessage(const QString &title, const QString &msg, - MessageIcon icon = Information, int msecs = 10000); QRect geometry() const; bool isVisible() const; @@ -104,6 +102,8 @@ public Q_SLOTS: void setVisible(bool visible); inline void show() { setVisible(true); } inline void hide() { setVisible(false); } + void showMessage(const QString &title, const QString &msg, + QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000); Q_SIGNALS: void activated(QSystemTrayIcon::ActivationReason reason);