diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
| commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
| tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /src/gui/kernel/qplatformsystemtrayicon.h | |
| parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
| parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'src/gui/kernel/qplatformsystemtrayicon.h')
| -rw-r--r-- | src/gui/kernel/qplatformsystemtrayicon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformsystemtrayicon.h b/src/gui/kernel/qplatformsystemtrayicon.h index 9bbaf5e9ca..d77bfa9f8f 100644 --- a/src/gui/kernel/qplatformsystemtrayicon.h +++ b/src/gui/kernel/qplatformsystemtrayicon.h @@ -70,7 +70,7 @@ public: virtual void updateMenu(QPlatformMenu *menu) = 0; virtual QRect geometry() const = 0; virtual void showMessage(const QString &title, const QString &msg, - const QIcon &icon, MessageIcon iconType, int secs) = 0; + const QIcon &icon, MessageIcon iconType, int msecs) = 0; virtual bool isSystemTrayAvailable() const = 0; virtual bool supportsMessages() const = 0; |