diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
commit | 350b0fadf3fbd12a278681513295577a066b0fb1 (patch) | |
tree | f0ebad6693c3cf3b7754fb8187a6b320e5d4679f /src/gui/util/qsystemtrayicon.cpp | |
parent | e4625e53aa893f7c59407913e743951294c7dafe (diff) | |
parent | 9d636095403f5abecbdff8ffffe658f35ff10001 (diff) | |
download | Qt-350b0fadf3fbd12a278681513295577a066b0fb1.zip Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.gz Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.bz2 |
Merge commit 'origin/4.6' into bearermanagement/integration-4
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
Diffstat (limited to 'src/gui/util/qsystemtrayicon.cpp')
-rw-r--r-- | src/gui/util/qsystemtrayicon.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/util/qsystemtrayicon.cpp b/src/gui/util/qsystemtrayicon.cpp index c6ea00f..d7dde87 100644 --- a/src/gui/util/qsystemtrayicon.cpp +++ b/src/gui/util/qsystemtrayicon.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -380,6 +380,9 @@ bool QSystemTrayIcon::supportsMessages() On Windows, the \a millisecondsTimeoutHint is usually ignored by the system when the application has focus. + On Mac OS X, the Growl notification system must be installed for this function to + display messages. + \sa show() supportsMessages() */ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg, |