[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 96b36cb1575c878609ee6e0919cd0406d66fa3fa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 20:05:51 2010 +0000

    2010-09-16  Thomas Zander <t.zander at nokia.com>
    
            Reviewed by Andreas Kling.
    
            https://bugs.webkit.org/show_bug.cgi?id=45878
    
            [Qt] Fixed incorrect Symbian scoping.
    
            The missing install functionality is only true for mmp based systems.
    
            * WebCore.pro: limit functionality to mmp systems.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cac83fa..db1d4d2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16  Thomas Zander <t.zander at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45878
+
+        [Qt] Fixed incorrect Symbian scoping.
+
+        The missing install functionality is only true for mmp based systems.
+
+        * WebCore.pro: limit functionality to mmp systems.
+
 2010-09-16  Anders Carlsson  <andersca at apple.com>
 
         Fix clang build.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 54ee536..b4051b1 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -3584,13 +3584,13 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
     }
 }
 
-!symbian {
+!symbian-abld:!symbian-sbsv2 {
     modfile.files = $$moduleFile
     modfile.path = $$[QMAKE_MKSPECS]/modules
 
     INSTALLS += modfile
 } else {
-    # INSTALLS is not implemented in qmake's s60 generators, copy headers manually
+    # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
 
     inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
     inst_modfile.input = moduleFile

-- 
WebKit Debian packaging