summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qsystemtrayicon_p.h
diff options
context:
space:
mode:
authorLorn Potter <lopotter@ljp-linux-vm.localdomain>2010-06-17 04:11:33 (GMT)
committerLorn Potter <lopotter@ljp-linux-vm.localdomain>2010-06-17 04:11:33 (GMT)
commit8335adf60299b728c0bf7a346a5afd94a3d56712 (patch)
treea8057969ac369ddffec9fa2b92e10cdf1fc319eb /src/gui/util/qsystemtrayicon_p.h
parent0948de26bca9a68a354b436895bdf9e2db9c4288 (diff)
parent30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff)
downloadQt-8335adf60299b728c0bf7a346a5afd94a3d56712.zip
Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.gz
Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.bz2
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/gui/util/qsystemtrayicon_p.h')
-rw-r--r--src/gui/util/qsystemtrayicon_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h
index e8bf197..4592e43 100644
--- a/src/gui/util/qsystemtrayicon_p.h
+++ b/src/gui/util/qsystemtrayicon_p.h
@@ -83,7 +83,9 @@ public:
void updateMenu_sys();
QRect geometry_sys() const;
void showMessage_sys(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs);
+
static bool isSystemTrayAvailable_sys();
+ static bool supportsMessages_sys();
QPointer<QMenu> menu;
QIcon icon;