[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit fd05e12f9eed8a59a8ba2ae1b551ae08f6556380
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 13:19:31 2010 +0000

    [Qt] Use a different Makefile names for sources generation and compilation.
    This prevents Makefile overwriting when running build-webkit twice.
    
    Unreviewed.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7b29b52..c4b13ab 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-14  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Unreviewed.
+
+        [Qt] Use a different Makefile names for sources generation and compilation.
+        This prevents Makefile overwriting when running build-webkit twice.
+
+        * Scripts/webkitdirs.pm:
+
 2010-01-14  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 1611942..5f44556 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1461,6 +1461,7 @@ sub buildQMakeProject($@)
     my @dsQmakeArgs = @buildArgs;
     push @dsQmakeArgs, "-r";
     push @dsQmakeArgs, sourceDir() . "/DerivedSources.pro";
+    push @dsQmakeArgs, "-o Makefile.DerivedSources";
     push @dsQmakeArgs, "CONFIG-=release";
     push @dsQmakeArgs, "CONFIG+=debug";
     print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";

-- 
WebKit Debian packaging