[or-cvs] r19370: {torbrowser} Update to Qt 4.5.1 (in torbrowser/trunk: . build-scripts)

[phobos at seul.org]

Author: phobos
Date: 2009-04-24 20:05:05 -0400 (Fri, 24 Apr 2009)
New Revision: 19370

Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/INSTALL
   torbrowser/trunk/build-scripts/Makefile
Log:
Update to Qt 4.5.1


Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2009-04-24 05:45:37 UTC (rev 19369)
+++ torbrowser/trunk/README	2009-04-25 00:05:05 UTC (rev 19370)
@@ -205,3 +205,4 @@
       Update Tor to 0.2.1.14-rc
 1.1.13:
       Update Firefox to 3.0.9
+      Update to Qt 4.5.1

Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL	2009-04-24 05:45:37 UTC (rev 19369)
+++ torbrowser/trunk/build-scripts/INSTALL	2009-04-25 00:05:05 UTC (rev 19370)
@@ -219,15 +219,15 @@
 Installing Qt
 =============
 
-Download Qt 4.1 or later, we'll use 4.5.0:
+Download Qt 4.1 or later, we'll use 4.5.1:
 
     http://trolltech.com/developer/downloads/qt/windows
 
 Download and run the installer with Windows Explorer:
 
-    ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.0-mingw.exe
+    ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.1-mingw.exe
 
-When prompted, install Qt into 'C:\Qt\4.5.0'
+When prompted, install Qt into 'C:\Qt\4.5.1'
 You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
 You may have an error about win32api.h being not found. This is not true. You
 have win32api.h and Qt is wrong.  This is a result of the Qt installer not
@@ -447,13 +447,13 @@
 Set a proper environment:
 
     cat << 'EOF' >> /etc/profile
-    export QTDIR="C:\Qt\4.5.0"
-    export PATH=$PATH:/c/Qt/4.5.0/bin
+    export QTDIR="C:\Qt\4.5.1"
+    export PATH=$PATH:/c/Qt/4.5.1/bin
     export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/
     export QMAKESPEC=win32-g++
     EOF
 
-    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.0/bin/
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.1/bin/
 
 Create the proper MSYS Makefiles and don't forget the '.' at the end!
 
@@ -481,7 +481,7 @@
 
       and other libraries with known full path:
 
-        C:/Qt/4.5.0/lib/libQtGui4.a
+        C:/Qt/4.5.1/lib/libQtGui4.a
 
 
       CMake is adding directories in the second list to the linker search path in
@@ -628,7 +628,7 @@
 An example to change the Qt Lib version:
 
         From: QT=/c/Qt/4.3.4/bin
-        To: QT=/c/Qt/4.5.0/bin
+        To: QT=/c/Qt/4.5.1/bin
 
 And then change the Tor version:
 

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2009-04-24 05:45:37 UTC (rev 19369)
+++ torbrowser/trunk/build-scripts/Makefile	2009-04-25 00:05:05 UTC (rev 19370)
@@ -13,7 +13,7 @@
 
 ## Location of required libraries
 MING=/c/MinGW/bin
-QT=/c/Qt/4.5.0/bin
+QT=/c/Qt/4.5.1/bin
 
 ## Location of bundle components
 VIDALIA=/c/build/vidalia-0.1.12