Changeset 2354 for vidalia/trunk/CMakeLists.txt

Timestamp:

02/23/08 23:02:19 (9 months ago)

Author:

edmanm

Message:

r129@lysithea: edmanm | 2008-02-23 23:02:10 -0500
Remove our tray icon implementation for X11 and Win32. We haven't used it
since we started requiring Qt >= 4.2.0 and part of the X11 implementation
is derived from another GPL'ed project. Removing it makes it easier to
add our OpenSSL license exception.

Files:

• vidalia/trunk/CMakeLists.txt (modified) (2 diffs)

vidalia/trunk/CMakeLists.txt

@@ -5 +5 @@
 #
 #  Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
+#  Copyright (C) 2008,  Matt Edman
 #
 #  This program is free software; you can redistribute it and/or
@@ -57 +58 @@
 endif(APPLE)
 
-## Check for QSystemTrayIcon
+## Check for QSslSocket
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${QT_INCLUDES})
-if (NOT APPLE)
-  check_include_file_cxx("qsystemtrayicon.h" HAVE_QSYSTEMTRAYICON_H)
-  if (HAVE_QSYSTEMTRAYICON_H)
-    option(USE_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
-  endif(HAVE_QSYSTEMTRAYICON_H)
-endif(NOT APPLE)
-
-## Check for QSslSocket
 check_include_file_cxx("qsslsocket.h" HAVE_QSSLSOCKET_H)
 if (HAVE_QSSLSOCKET_H)