[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 9478d8f4ece40a69fb488d3a6b634a0a1dad9a67
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 10:01:01 2010 +0000

    [Qt] Manually add support for the install target on Symbian.
    
    This is required to copy the headers over the ones in Qt.
    
    Reviewed by Tor Arne Vestbo.
    
    .:
    
    * WebKit.pro:
    
    WebCore:
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ddae0cb..c53778e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Manually add support for the install target on Symbian.
+
+        This is required to copy the headers over the ones in Qt.
+
+        * WebKit.pro:
+
 2010-02-11  Fridrich Strba  <fridrich.strba at bluewin.ch>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d933994..72fb468 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Manually add support for the install target on Symbian.
+
+        This is required to copy the headers over the ones in Qt.
+
+        * WebCore.pro:
+
+2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         [Qt] Minor fixes on QtWebKit headers generation.
 
         - Adds QtWebKit to the generated headers destination path
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 5c17e1d..720c26b 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2665,17 +2665,25 @@ SOURCES += \
 }
 
 include(../include/QtWebKit/headers.pri)
-
-HEADERS += $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
+HEADERS += $$WEBKIT_API_HEADERS
+WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include/headers.pri
 
 !symbian {
+    headers.files = $$WEBKIT_INSTALL_HEADERS
+    headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
     target.path = $$[QT_INSTALL_LIBS]
-    INSTALLS += target
-}
 
-headers.files = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include/headers.pri
-headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
-INSTALLS += headers
+    INSTALLS += target headers
+} else {
+    # INSTALLS is not implemented in qmake's s60 generators, copy headers manually
+    inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+    inst_headers.input = WEBKIT_INSTALL_HEADERS
+    inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+    QMAKE_EXTRA_COMPILERS += inst_headers
+
+    install.depends += compiler_inst_headers_make_all
+    QMAKE_EXTRA_TARGETS += install
+}
 
 # Qt will set the version for us when building in Qt's tree
 !CONFIG(QTDIR_build): VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
diff --git a/WebKit.pro b/WebKit.pro
index f63eaa0..2dac64f 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -27,4 +27,10 @@ build-qtscript {
         JavaScriptCore/qt/tests
 }
 
+symbian {
+    # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
+    install.commands = $(MAKE) -C WebCore install
+    QMAKE_EXTRA_TARGETS += install
+}
+
 include(WebKit/qt/docs/docs.pri)

-- 
WebKit Debian packaging