[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit bd02274d4499f4b37980d96428d7b129ef2bbc16
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 16:16:54 2010 +0000

    [Qt] Fix the build with MSVC.
    
    Reviewed by nobody, build fix.
    
    Splitting the condition in two to prevent qmake parentheses issues.
    
    * Api/DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69962 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index d8bd1db..8084242 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -10,7 +10,9 @@ DESTDIR = ../../../include/QtWebKit
 QUOTE = ""
 DOUBLE_ESCAPED_QUOTE = ""
 ESCAPE = ""
-win32-msvc* | wince* | contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) {
+win32-msvc* | wince* {
+    ESCAPE = "^"
+} else:contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) {
     # MinGW's make will run makefile commands using sh, even if make
     #  was run from the Windows shell, if it finds sh in the path.
     ESCAPE = "^"
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 93b0474..464095c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-18  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by nobody, build fix.
+
+        [Qt] Fix the build with MSVC.
+
+        Splitting the condition in two to prevent qmake parentheses issues.
+
+        * Api/DerivedSources.pro:
+
 2010-10-18  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging