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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 562d4841a6d4eb2561185b17b5df91afa44b108f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 13:16:13 2010 +0000

    2010-02-02  Simon Hausmann  <simon.hausmann at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Install libraries and headers in package builds
            https://bugs.webkit.org/show_bug.cgi?id=34325
    
            Add the QtWebKit libraries to the installable items, except on
            Symbian where the libraries are always linked in their final
            destination.
    
            Also include the headers generated by syncqt in the installation.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54229 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d171bc0..9843554 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-02  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Install libraries and headers in package builds
+        https://bugs.webkit.org/show_bug.cgi?id=34325
+
+        Add the QtWebKit libraries to the installable items, except on
+        Symbian where the libraries are always linked in their final
+        destination.
+
+        Also include the headers generated by syncqt in the installation.
+
+        * WebCore.pro:
+
 2010-02-02  Kavita Kanetkar  <kkanetkar at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 7ada739..dacb8d5 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2661,7 +2661,19 @@ SOURCES += \
 
 include($$PWD/../WebKit/qt/Api/headers.pri)
 HEADERS += $$WEBKIT_API_HEADERS
-!CONFIG(standalone_package) {
+CONFIG(standalone_package) {
+
+    !symbian {
+        target.path = $$[QT_INSTALL_LIBS]
+        INSTALLS += target
+    }
+
+    include($$PWD/../include/QtWebKit/headers.pri)
+    headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+    headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
+    INSTALLS += headers
+
+} else {
     target.path = $$[QT_INSTALL_LIBS]
     headers.files = $$WEBKIT_API_HEADERS
     headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit

-- 
WebKit Debian packaging