1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make QSystemTrayIcon::showMessage invokable

Browse Source 
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 <Friedemann.Kleint@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Allan Sandfeld Jensen 2013-10-04 16:44:42 +02:00 committed by The Qt Project
parent 5e4b9f1154
commit 9e7fa9f72b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/util/qsystemtrayicon.cpp
View File

@ -380,6 +380,8 @@ bool QSystemTrayIcon::supportsMessages()
On Mac OS X, the Growl notification system must be installed for this function to On Mac OS X, the Growl notification system must be installed for this function to
display messages. display messages.
Has been turned into a slot in Qt 5.2.
\sa show(), supportsMessages() \sa show(), supportsMessages()
*/ */
void QSystemTrayIcon::showMessage(const QString& title, const QString& msg, void QSystemTrayIcon::showMessage(const QString& title, const QString& msg,

4
src/widgets/util/qsystemtrayicon.h
View File

@ -94,8 +94,6 @@ public:
static bool supportsMessages(); static bool supportsMessages();
enum MessageIcon { NoIcon, Information, Warning, Critical }; enum MessageIcon { NoIcon, Information, Warning, Critical };
void showMessage(const QString &title, const QString &msg,
MessageIcon icon = Information, int msecs = 10000);
QRect geometry() const; QRect geometry() const;
bool isVisible() const; bool isVisible() const;
@ -104,6 +102,8 @@ public Q_SLOTS:
void setVisible(bool visible); void setVisible(bool visible);
inline void show() { setVisible(true); } inline void show() { setVisible(true); }
inline void hide() { setVisible(false); } inline void hide() { setVisible(false); }
void showMessage(const QString &title, const QString &msg,
QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information, int msecs = 10000);
Q_SIGNALS: Q_SIGNALS:
void activated(QSystemTrayIcon::ActivationReason reason); void activated(QSystemTrayIcon::ActivationReason reason);