diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-12-10 20:28:29 +0300 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-18 10:18:23 +0100 |
| commit | 15cc31c013afdefcb432bbeb94d10b4121c09e54 (patch) | |
| tree | f32c54c0dd46aaf122e841b107d971a2d14b3677 /src/gui/kernel/qplatformsystemtrayicon.cpp | |
| parent | 384558d78a9a1bf1d8c8483036e32b616d7f275b (diff) | |
QPlatformSystemTrayIcon: the timeout is in msecs, not secs
What gets passed to this function is in milliseconds, not seconds (see
QSystemTrayIconPrivate::showMessage_sys_qpa implementation), and the only
currently existing implementation (in KDE frameworkintegration) expects
milliseconds as well.
Change-Id: I7a2c847530391aa73183704251c996664668a740
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qplatformsystemtrayicon.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformsystemtrayicon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformsystemtrayicon.cpp b/src/gui/kernel/qplatformsystemtrayicon.cpp index 7bc61e6e6e..ba1ccc379d 100644 --- a/src/gui/kernel/qplatformsystemtrayicon.cpp +++ b/src/gui/kernel/qplatformsystemtrayicon.cpp @@ -119,9 +119,9 @@ QPlatformSystemTrayIcon::~QPlatformSystemTrayIcon() /*! \fn void QPlatformSystemTrayIcon::showMessage(const QString &msg, const QString &title, - const QIcon &icon, MessageIcon iconType, int secs) + const QIcon &icon, MessageIcon iconType, int msecs) Shows a balloon message for the entry with the given \a title, message \a msg and \a icon for - the time specified in \a secs. \a iconType is used as a hint for the implementing platform. + the time specified in \a msecs. \a iconType is used as a hint for the implementing platform. \sa QSystemTrayIcon::showMessage() */ |