From 2de868ecabe125c96f7834cede54dc8a3d26d68b Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Sat, 16 Apr 2011 04:48:54 +0000 Subject: don't use system tray icon when not available --- examples/GuiClient/mainDialog.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'examples/GuiClient/mainDialog.cpp') diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp index ae793bc0..66638be6 100644 --- a/examples/GuiClient/mainDialog.cpp +++ b/examples/GuiClient/mainDialog.cpp @@ -47,7 +47,12 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), ui(new Ui::mainDialogClass), m_rosterItemModel(this), m_rosterItemSortFilterModel(this), m_vCardCache(&m_xmppClient), m_capabilitiesCache(&m_xmppClient), m_accountsCache(this), - m_trayIcon(this), m_trayIconMenu(this), m_quitAction("Quit", this), + +#ifndef QT_NO_SYSTEMTRAYICON + m_trayIcon(this), m_trayIconMenu(this), +#endif + + m_quitAction("Quit", this), m_signOutAction("Sign out", this), m_settingsMenu(0) { @@ -644,14 +649,15 @@ void mainDialog::action_quit() void mainDialog::createTrayIconAndMenu() { - m_trayIcon.setIcon(QIcon(":/icons/resource/icon.png")); - bool check = connect(&m_quitAction, SIGNAL(triggered()), SLOT(action_quit())); Q_ASSERT(check); check = connect(&m_signOutAction, SIGNAL(triggered()), SLOT(action_signOut())); Q_ASSERT(check); +#ifndef QT_NO_SYSTEMTRAYICON + m_trayIcon.setIcon(QIcon(":/icons/resource/icon.png")); + check = connect(&m_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(action_trayIconActivated(QSystemTrayIcon::ActivationReason))); Q_ASSERT(check); @@ -662,6 +668,7 @@ void mainDialog::createTrayIconAndMenu() m_trayIcon.setContextMenu(&m_trayIconMenu); m_trayIcon.show(); +#endif } void mainDialog::createSettingsMenu() -- cgit v1.2.3