[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 04a7d55dc6f50c4605222df5456fa967d850ab73
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 13:25:07 2009 +0000

    2009-10-05  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Disable TCmalloc for Windows port at the present, because MinGW
            hasn't got built-in pthread library.
    
            * WebKit.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 90068ce..ca8313e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-05  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Disable TCmalloc for Windows port at the present, because MinGW
+        hasn't got built-in pthread library.
+
+        * WebKit.pri:
+
 2009-10-02  Prasanth Ullattil  <prasanth.ullattil at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit.pri b/WebKit.pri
index 6e20393..2dba0d4 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -31,7 +31,7 @@ building-libs {
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 
-!win32:!mac:!unix|symbian {
+!mac:!unix|symbian {
     DEFINES += USE_SYSTEM_MALLOC
 }
 

-- 
WebKit Debian packaging