[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 0e372486ab3ee03a84a37cac2a91596735f5e0ce
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 12:04:35 2010 +0000

    2010-09-09  Kristian Amlie  <kristian.amlie at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fixed incorrect Symbian scoping.
    
            The missing install functionality is only true for mmp based systems.
    
            https://bugs.webkit.org/show_bug.cgi?id=45268
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3c179b..d152308 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-09  Kristian Amlie  <kristian.amlie at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fixed incorrect Symbian scoping.
+
+        The missing install functionality is only true for mmp based systems.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45268
+
+        * WebCore.pro:
+
 2010-09-09  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 55df644..9ec5a7d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -3230,7 +3230,7 @@ HEADERS += $$WEBKIT_API_HEADERS
     exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri)
     WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
 
-    !symbian {
+    !symbian-abld:!symbian-sbsv2 {
         headers.files = $$WEBKIT_INSTALL_HEADERS
 
         !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit
@@ -3244,7 +3244,7 @@ HEADERS += $$WEBKIT_API_HEADERS
 
         INSTALLS += target headers 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_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
         inst_headers.input = WEBKIT_INSTALL_HEADERS
         inst_headers.CONFIG = no_clean

-- 
WebKit Debian packaging