[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 37491be59eb885c1c95ea978514924a8c57d1954
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 20:53:56 2010 +0000

    [Qt] fix qt_webkit_version.pri install for in-Qt builds
    
    Patch by Oswald Buddenhagen <oswald.buddenhagen at nokia.com> on 2010-09-12
    Reviewed by Simon Hausmann.
    
    Always add the target, even if building inside Qt - as opposed to the
    headers and libraries, there are no rules for that coming from
    qbase.pri.
    
    Task-number: QTBUG-13306
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 77b61f3..bafc72e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] fix qt_webkit_version.pri install for in-Qt builds
+
+        Always add the target, even if building inside Qt - as opposed to the
+        headers and libraries, there are no rules for that coming from
+        qbase.pri.
+
+        Task-number: QTBUG-13306
+
+        * WebCore.pro:
+
+2010-09-12  Oswald Buddenhagen  <oswald.buddenhagen at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Let QtWebKit inject itself into the qt configuration
 
         i.e., don't explicitly deal with qt_webkit_version.pri outside of the
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f2081cb..6c67bde 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -3587,6 +3587,25 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
     }
 }
 
+!symbian {
+    modfile.files = $$moduleFile
+    modfile.path = $$[QMAKE_MKSPECS]/modules
+
+    INSTALLS += modfile
+} else {
+    # INSTALLS is not implemented in qmake's s60 generators, copy headers manually
+
+    inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+    inst_modfile.input = moduleFile
+    inst_modfile.output = $$[QMAKE_MKSPECS]/modules
+    inst_modfile.CONFIG = no_clean
+
+    QMAKE_EXTRA_COMPILERS += inst_modfile
+
+    install.depends += compiler_inst_modfile_make_all
+    QMAKE_EXTRA_TARGETS += install
+}
+
 include($$PWD/../WebKit/qt/Api/headers.pri)
 
 HEADERS += $$WEBKIT_API_HEADERS
@@ -3604,10 +3623,7 @@ HEADERS += $$WEBKIT_API_HEADERS
         !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS
         else: target.path = $$[QT_INSTALL_LIBS]
 
-        modfile.files = $$moduleFile
-        modfile.path = $$[QMAKE_MKSPECS]/modules
-
-        INSTALLS += target headers modfile
+        INSTALLS += target headers
     } else {
         # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
         inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
@@ -3619,15 +3635,7 @@ HEADERS += $$WEBKIT_API_HEADERS
 
         QMAKE_EXTRA_COMPILERS += inst_headers
 
-        inst_modfile.commands = $$inst_headers.commands
-        inst_modfile.input = moduleFile
-        inst_modfile.output = $$[QMAKE_MKSPECS]/modules
-        inst_modfile.CONFIG = no_clean
-
-        QMAKE_EXTRA_COMPILERS += inst_modfile
-
-        install.depends += compiler_inst_headers_make_all compiler_inst_modfile_make_all
-        QMAKE_EXTRA_TARGETS += install
+        install.depends += compiler_inst_headers_make_all
     }
 
     win32-*|wince* {

-- 
WebKit Debian packaging