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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8a5ecd56f3e3f683f35d1f253cdc602c6671a29c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 22:14:29 2010 +0000

    2010-01-19  Kristian Amlie <kristian.amlie at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Fix qmake warning with qmake in Qt for Symbian
            https://bugs.webkit.org/show_bug.cgi?id=33786
    
            * WebCore.pro: Use QMAKE_LFLAGS instead of MMP_RULES.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b46fa9..e59a3d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-19  Kristian Amlie <kristian.amlie at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix qmake warning with qmake in Qt for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=33786
+
+        * WebCore.pro: Use QMAKE_LFLAGS instead of MMP_RULES.
+
 2010-01-19  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e3a8c06..f8a71bb 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -26,7 +26,7 @@ symbian: {
     MMP_RULES += "USERINCLUDE platform/text"
     # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
     # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
-    MMP_RULES += "LINKEROPTION  armcc --rw-base 0xE00000"
+    QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000
     MMP_RULES += ALWAYS_BUILD_AS_ARM
     QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }

-- 
WebKit Debian packaging