[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6169fa5030711e4fbd122cae888f1b532bfb6357
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 14:52:03 2010 +0000

    [Qt] Simplify the qmake code for freezing QtWebKit on Symbian.
    
    Patch by Iain Campbell <iain.campbell at accenture.com> on 2010-01-21
    Reviewed by Simon Hausmann.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28f74e8..456cee1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-21  Iain Campbell <iain.campbell at accenture.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Simplify the qmake code for freezing QtWebKit on Symbian.
+
+        * WebCore.pro:
+
 2010-01-21  Steve Block  <steveblock at google.com>
 
         Unreviewed speculative build fix for Windows.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4ae6b47..4b4a888 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2740,14 +2740,9 @@ SOURCES += \
 
 symbian {
     shared {
+        contains(CONFIG, def_files) {
         contains(MMP_RULES, defBlock) {
-            MMP_RULES -= defBlock
-
-            MMP_RULES += "$${LITERAL_HASH}ifdef WINSCW" \
-                    "DEFFILE ../WebKit/qt/symbian/bwins/$${TARGET}.def" \
-                    "$${LITERAL_HASH}elif defined EABI" \
-                    "DEFFILE ../WebKit/qt/symbian/eabi/$${TARGET}.def" \
-                    "$${LITERAL_HASH}endif"
+            defFilePath=../WebKit/qt/symbian
         } else {
             MMP_RULES += EXPORTUNFROZEN
         }

-- 
WebKit Debian packaging