[vidalia-svn] r2319: Rename WITH_QSYSTEMTRAYICON to USE_QSYSTEMTRAYICON to be con (in vidalia/trunk: . src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-23 13:17:06 -0500 (Wed, 23 Jan 2008)
New Revision: 2319

Modified:
   vidalia/trunk/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/src/vidalia/CMakeLists.txt
Log:
 r71@lysithea:  edmanm | 2008-01-23 13:16:55 -0500
 Rename WITH_QSYSTEMTRAYICON to USE_QSYSTEMTRAYICON to be consistent with
 USE_QSSLSOCKET.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r71] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-01-23 18:17:03 UTC (rev 2318)
+++ vidalia/trunk/CMakeLists.txt	2008-01-23 18:17:06 UTC (rev 2319)
@@ -55,10 +55,10 @@
   check_include_file_cxx("qsystemtrayicon.h" HAVE_QSYSTEMTRAYICON_H)
   if (HAVE_QSYSTEMTRAYICON_H)
     option(WITH_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
-    if (NOT WITH_QSYSTEMTRAYICON)
+    if (NOT USE_QSYSTEMTRAYICON)
       ## Disable the use of QSystemTrayIcon
       set(HAVE_QSYSTEMTRAYICON_H "")
-    endif(NOT WITH_QSYSTEMTRAYICON)
+    endif(NOT USE_QSYSTEMTRAYICON)
   endif(HAVE_QSYSTEMTRAYICON_H)
 endif(NOT APPLE)
 

Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2008-01-23 18:17:03 UTC (rev 2318)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2008-01-23 18:17:06 UTC (rev 2319)
@@ -152,11 +152,11 @@
 ## Choose the correct tray icon implementation for the current platform
 set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon.cpp)
 qt4_wrap_cpp(vidalia_SRCS tray/trayicon.h)
-if(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE)
+if(USE_QSYSTEMTRAYICON AND NOT APPLE)
   ## Use Qt's QSystemTrayIcon implementation
   set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_qt.cpp)
   qt4_wrap_cpp(vidalia_SRCS tray/trayicon_qt.h)
-else(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE)
+else(USE_QSYSTEMTRAYICON AND NOT APPLE)
   ## Use our custom tray icon implementation
   if(WIN32)
     set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_win.cpp)
@@ -170,7 +170,7 @@
       qt4_wrap_cpp(vidalia_SRCS tray/trayicon_x11.h)
     endif(APPLE)
   endif(WIN32)
-endif(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE)
+endif(USE_QSYSTEMTRAYICON AND NOT APPLE)
 
 ## Main Vidalia sources
 set(vidalia_SRCS ${vidalia_SRCS}