[or-cvs] r14826: Make Qt 4.3.5 the default version (still customizable from M (in torbrowser/trunk: . build-scripts)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-05-29 10:03:31 -0400 (Thu, 29 May 2008)
New Revision: 14826

Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/INSTALL
   torbrowser/trunk/build-scripts/Makefile
Log:
Make Qt 4.3.5 the default version (still customizable from Makefile)

Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2008-05-29 14:00:20 UTC (rev 14825)
+++ torbrowser/trunk/README	2008-05-29 14:03:31 UTC (rev 14826)
@@ -130,4 +130,5 @@
 1.0.3: Released 2008-05-16
        Update Tor to 0.2.0.26-rc
 1.0.4: Released 2008-xx-xx
-       Replace startup batch script with application (RelativeLink), so there is a helpful icon
\ No newline at end of file
+       Replace startup batch script with application (RelativeLink), so there is a helpful icon
+       Make Qt 4.3.5 the default version

Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL	2008-05-29 14:00:20 UTC (rev 14825)
+++ torbrowser/trunk/build-scripts/INSTALL	2008-05-29 14:03:31 UTC (rev 14826)
@@ -216,15 +216,15 @@
 Installing Qt
 =============
 
-Download Qt 4.1 or later, we'll use 4.3.4:
+Download Qt 4.1 or later, we'll use 4.3.5:
 
     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.3.4-mingw.exe
+    ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.3.5-mingw.exe
 
-When prompted, install Qt into 'C:\Qt\4.3.4'
+When prompted, install Qt into 'C:\Qt\4.3.5'
 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
@@ -431,13 +431,13 @@
 Set a proper environment:
 
     cat << 'EOF' >> /etc/profile
-    export QTDIR="C:\Qt\4.3.2"
-    export PATH=$PATH:/c/Qt/4.3.2/bin
+    export QTDIR="C:\Qt\4.3.5"
+    export PATH=$PATH:/c/Qt/4.3.5/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.3.4/bin/
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.3.5/bin/
 
 Create the proper MinGW Makefiles and don't forget the '.' at the end!
 
@@ -465,7 +465,7 @@
 
       and other libraries with known full path:
 
-        C:/Qt/4.3.4/lib/libQtGui4.a
+        C:/Qt/4.3.5/lib/libQtGui4.a
 
 
       CMake is adding directories in the second list to the linker search path in
@@ -597,8 +597,8 @@
 
 An example to change the Qt Lib version:
 
-        From: QT=/c/Qt/4.3.2/bin
-        To: QT=/c/Qt/4.3.2/bin
+        From: QT=/c/Qt/4.3.5/bin
+        To: QT=/c/Qt/4.3.5/bin
 
 And then change the Tor version:
 
@@ -630,3 +630,4 @@
 If the Mozilla code differs from the Vidalia one, update 
 patch-vidalia-language.sh accordingly.
 
+

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-05-29 14:00:20 UTC (rev 14825)
+++ torbrowser/trunk/build-scripts/Makefile	2008-05-29 14:03:31 UTC (rev 14826)
@@ -13,7 +13,7 @@
 
 ## Location of required libraries
 MING=/c/MinGW/bin
-QT=/c/Qt/4.3.2/bin
+QT=/c/Qt/4.3.5/bin
 
 ## Location of bundle components
 VIDALIA=/c/build/vidalia
@@ -125,9 +125,9 @@
 	mkdir -p $(DOCSDIR)/Qt
 	mkdir -p $(DOCSDIR)/MinGW
 	mkdir -p $(DOCSDIR)/Polipo
-	cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(QT)/../LICENSE.GPL $(DOCSDIR)/Vidalia
+	cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia
 	cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor
-	cp $(QT)/../LICENSE.GPL $(DOCSDIR)/Qt
+	cp $(QT)/../LICENSE.GPL* $(QT)/../GPL* $(DOCSDIR)/Qt
 	cp $(MING)/../COPYING $(DOCSDIR)/MinGW
 	cp $(POLIPO)/COPYING  $(POLIPO)/README $(DOCSDIR)/Polipo