[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 99324cfa993803f64de3555f324181db0f1d5093
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 13:23:53 2010 +0000

    [Qt] Fix forward includes generation for MSVC when sh is in PATH.
    
    Reviewed by Simon Hausmann.
    
    MSVC's nmake isn't affected by having sh in PATH.
    
    * Api/DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index 86d5dac..6fb52f2 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -10,7 +10,7 @@ DESTDIR = ../../../include/QtWebKit
 QUOTE = ""
 DOUBLE_ESCAPED_QUOTE = ""
 ESCAPE = ""
-contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) {
+win32-msvc* | (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 b1c4425..0a9a245 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix forward includes generation for MSVC when sh is in PATH.
+
+        MSVC's nmake isn't affected by having sh in PATH.
+
+        * Api/DerivedSources.pro:
+
 2010-09-18  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging