[vidalia-svn] r3730: New rule: you must have Qt 4.3 or later to build Vidalia 0.2 (vidalia/trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-04-24 23:25:33 -0400 (Fri, 24 Apr 2009)
New Revision: 3730

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/README
Log:

New rule: you must have Qt 4.3 or later to build Vidalia 0.2.x. With the
things we've added that require QSslSocket, it's becoming a pain to keep
making these features optional for those few (if any) suckers still running a
distro that will only let them have a Qt from 2007.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-04-25 03:20:10 UTC (rev 3729)
+++ vidalia/trunk/CHANGELOG	2009-04-25 03:25:33 UTC (rev 3730)
@@ -8,6 +8,7 @@
     for consistency with our 'make dist-osx' target.
   o Fix a couple bugs in the WiX-based Windows installer related to building
     a Marble-enabled Vidalia installer.
+  o Raise the minimum required Qt version from 4.2 to 4.3.
 
 
 0.2.0   19-Mar-2009

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2009-04-25 03:20:10 UTC (rev 3729)
+++ vidalia/trunk/CMakeLists.txt	2009-04-25 03:25:33 UTC (rev 3730)
@@ -30,11 +30,7 @@
 option(USE_MARBLE "Enable the KDE Marble-based map widget." OFF)
 
 ## Specify the minimum version of Qt required
-if (USE_MARBLE)
-  set(QT_MIN_VERSION    "4.3.0")
-else(USE_MARBLE)
-  set(QT_MIN_VERSION    "4.2.0")
-endif(USE_MARBLE)
+set(QT_MIN_VERSION    "4.3.0")
 
 ## Specify the Qt libraries used
 include(FindQt4)

Modified: vidalia/trunk/README
===================================================================
--- vidalia/trunk/README	2009-04-25 03:20:10 UTC (rev 3729)
+++ vidalia/trunk/README	2009-04-25 03:25:33 UTC (rev 3730)
@@ -7,7 +7,7 @@
 contribute to the Tor network by helping you set up and manage your own Tor
 server.
 
-Vidalia runs on most platforms supported by Qt 4.2 or later, including
+Vidalia runs on most platforms supported by Qt 4.3 or later, including
 Windows, Mac OS X, and Linux or other Unix variants using the X11 window
 system.