[vidalia-svn] r2205: Try out a temporary fix to see if this makes phobos's moc ge (trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-08 12:58:05 -0500 (Sat, 08 Dec 2007)
New Revision: 2205

Modified:
   trunk/src/vidalia/mainwindow.h
Log:
Try out a temporary fix to see if this makes phobos's moc generate the correct output.

Modified: trunk/src/vidalia/mainwindow.h
===================================================================
--- trunk/src/vidalia/mainwindow.h	2007-12-08 16:57:17 UTC (rev 2204)
+++ trunk/src/vidalia/mainwindow.h	2007-12-08 17:58:05 UTC (rev 2205)
@@ -117,7 +117,7 @@
   /** Called when the "show on startup" checkbox is toggled. */
   void toggleShowOnStartup(bool checked);
   
-#if defined(USE_QSYSTEMTRAYICON)
+#if QT_VERSION >= 0x040200 && !defined(Q_WS_MAC)
   /** Displays the main window if <b>reason</b> is DoubleClick. */
   void trayActivated(QSystemTrayIcon::ActivationReason reason);
 #endif
@@ -188,7 +188,7 @@
    * the password and when we need to provide the password itself. */
   QString _controlPassword;
 
-#if defined(USE_QSYSTEMTRAYICON)
+#if QT_VERSION >= 0x040200 && !defined(Q_WS_MAC)
   QSystemTrayIcon _trayIcon; /**< The Vidalia icon that sits in the tray.
                                   (post-Qt 4.2) */
 #else