summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qsystemtrayicon_x11.cpp
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 09:16:04 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 09:16:04 (GMT)
commit0a852d51c6d74712cda8c7d08da4f5c90d99d5cd (patch)
tree2ac9f365b8a25738d3756d051d7ccccea27bff7e /src/gui/util/qsystemtrayicon_x11.cpp
parentcf74e83d8b79c4840c073bb7dc387045b1210df8 (diff)
parente4fbdd4fde9b8d2acc13268b44caa57405c3db1a (diff)
downloadQt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.zip
Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.gz
Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/util/qsystemtrayicon_x11.cpp')
-rw-r--r--src/gui/util/qsystemtrayicon_x11.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp
index 82b4325..59fdc07 100644
--- a/src/gui/util/qsystemtrayicon_x11.cpp
+++ b/src/gui/util/qsystemtrayicon_x11.cpp
@@ -381,6 +381,11 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
return QSystemTrayIconSys::locateSystemTray() != XNone;
}
+bool QSystemTrayIconPrivate::supportsMessages_sys()
+{
+ return true;
+}
+
void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
QSystemTrayIcon::MessageIcon icon, int msecs)
{