Changeset 2319

Show
Ignore:
Timestamp:
01/23/08 13:17:06 (12 months ago)
Author:
edmanm
Message:

r71@lysithea: edmanm | 2008-01-23 13:16:55 -0500
Rename WITH_QSYSTEMTRAYICON to USE_QSYSTEMTRAYICON to be consistent with
USE_QSSLSOCKET.

Location:
vidalia/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • vidalia/trunk/CMakeLists.txt

    r2230 r2319  
    5656  if (HAVE_QSYSTEMTRAYICON_H) 
    5757    option(WITH_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON) 
    58     if (NOT WITH_QSYSTEMTRAYICON) 
     58    if (NOT USE_QSYSTEMTRAYICON) 
    5959      ## Disable the use of QSystemTrayIcon 
    6060      set(HAVE_QSYSTEMTRAYICON_H "") 
    61     endif(NOT WITH_QSYSTEMTRAYICON) 
     61    endif(NOT USE_QSYSTEMTRAYICON) 
    6262  endif(HAVE_QSYSTEMTRAYICON_H) 
    6363endif(NOT APPLE) 

  • vidalia/trunk/src/vidalia/CMakeLists.txt

    r2307 r2319  
    153153set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon.cpp) 
    154154qt4_wrap_cpp(vidalia_SRCS tray/trayicon.h) 
    155 if(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE) 
     155if(USE_QSYSTEMTRAYICON AND NOT APPLE) 
    156156  ## Use Qt's QSystemTrayIcon implementation 
    157157  set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_qt.cpp) 
    158158  qt4_wrap_cpp(vidalia_SRCS tray/trayicon_qt.h) 
    159 else(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE) 
     159else(USE_QSYSTEMTRAYICON AND NOT APPLE) 
    160160  ## Use our custom tray icon implementation 
    161161  if(WIN32) 
    … …  
    171171    endif(APPLE) 
    172172  endif(WIN32) 
    173 endif(HAVE_QSYSTEMTRAYICON_H AND NOT APPLE) 
     173endif(USE_QSYSTEMTRAYICON AND NOT APPLE) 
    174174 
    175175## Main Vidalia sources