[vidalia-svn] r3639: Add WebKit to the Windows installer. Helloooo extra 10MB. (in vidalia/trunk: . pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-21 00:03:31 -0400 (Sat, 21 Mar 2009)
New Revision: 3639

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/pkg/win32/vidalia.wxs.in
Log:

Add WebKit to the Windows installer. Helloooo extra 10MB.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-03-21 03:36:20 UTC (rev 3638)
+++ vidalia/trunk/CHANGELOG	2009-03-21 04:03:31 UTC (rev 3639)
@@ -1,6 +1,8 @@
 0.2.1   xx-xxx-2009
   o Renamed the 'make win32-installer' CMake target to 'make dist-win32'
     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.
 
 
 0.2.0   19-Mar-2009

Modified: vidalia/trunk/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-21 03:36:20 UTC (rev 3638)
+++ vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-03-21 04:03:31 UTC (rev 3639)
@@ -115,6 +115,8 @@
         <?if $(var.UseMarble) = "ON"?>
           <File Id="QtSvg4Dll" DiskId="1"
                 Name="QtSvg4.dll" Source="@QT_BINARY_DIR@\QtSvg4.dll" />
+          <File Id="QtWebKit4Dll" DiskId="1"
+                Name="QtWebKit4.dll" Source="@QT_BINARY_DIR@\QtWebKit4.dll" />
         <?endif?>
       </Component>