diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-04 16:44:42 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 18:47:27 +0200 |
commit | 9e7fa9f72b0f83bff77fffe127bd3b34a8f54aa7 (patch) | |
tree | e7cf05b99a110f0347e3ad31d9be4c23f3b36b41 /src/widgets/util/qsystemtrayicon.h | |
parent | 5e4b9f11543e8573cd3bbe9cad83274d44ce74a3 (diff) |
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 <Friedemann.Kleint@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/widgets/util/qsystemtrayicon.h')
-rw-r--r-- | src/widgets/util/qsystemtrayicon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 278efae586..d6ba553a3a 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); |