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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 79a500462bd7ff14fc94c98e75a7e2d29eaa9c7c
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 13:04:40 2010 +0000

    2010-08-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Fix predeclared variables for Symbian to be able to build QtWebKit for Symbian on Linux.
    
            * Api/DerivedSources.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index 62546f6..86d5dac 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -10,15 +10,14 @@ DESTDIR = ../../../include/QtWebKit
 QUOTE = ""
 DOUBLE_ESCAPED_QUOTE = ""
 ESCAPE = ""
-win32-msvc*|symbian {
-    ESCAPE = "^"
-} else:win32-g++*:isEmpty(QMAKE_SH) {
+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 = "^"
 } else {
     QUOTE = "\'"
     DOUBLE_ESCAPED_QUOTE = "\\\'"
+    ESCAPE = "\\"
 }
 
 qtheader_module.target = $${DESTDIR}/QtWebKit
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 25aacea..4c586b8 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix predeclared variables for Symbian to be able to build QtWebKit for Symbian on Linux.
+
+        * Api/DerivedSources.pro:
+
 2010-08-20  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Ariya Hidayat.

-- 
WebKit Debian packaging