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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 126d579ea89f0c3d426ca456f269455cc8d780d5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 18:08:46 2010 +0000

    2010-08-04  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt][Symbian] Variable max heap size between target/emulator
            https://bugs.webkit.org/show_bug.cgi?id=41480
    
            * WebKit.pri: Symbian-only code block for EPOCHEAPSIZE configuration
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 2c548a1..e17a1f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-04  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Variable max heap size between target/emulator
+        https://bugs.webkit.org/show_bug.cgi?id=41480
+
+        * WebKit.pri: Symbian-only code block for EPOCHEAPSIZE configuration
+
 2010-08-03  Eric Seidel  <eric at webkit.org>
 
         Unreviewed.  Test commit for commit-queue at webkit.org.
diff --git a/WebKit.pri b/WebKit.pri
index c05c2a2..21404dd 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -30,7 +30,15 @@ building-libs {
                 LIBS += -lQtWebKit
                 symbian {
                     TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB
-                    TARGET.EPOCHEAPSIZE = 0x20000 0x6000000 // Min 128kB, Max 96MB
+                    # For EXEs only: set heap to usable value
+                    TARGET.EPOCHEAPSIZE = 
+                    heapSizeRule = \
+                    "$${LITERAL_HASH}ifdef WINSCW" \
+                        "EPOCHEAPSIZE  0x40000 0x2000000 // Min 256kB, Max 32MB" \
+                    "$${LITERAL_HASH}else" \
+                        "EPOCHEAPSIZE  0x40000 0x6000000 // Min 256kB, Max 96MB" \
+                    "$${LITERAL_HASH}endif"
+                    MMP_RULES += heapSizeRule
                 }
             }
         }

-- 
WebKit Debian packaging