[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 b90068a320c6b7c4e15aacf2bfa82696a9aa63fe
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 20:50:22 2010 +0000

    WebCore: [Qt] Let QtWebKit inject itself into the qt configuration
    
    Patch by Oswald Buddenhagen <oswald.buddenhagen at nokia.com> on 2010-09-12
    Reviewed by Simon Hausmann.
    
    i.e., don't explicitly deal with qt_webkit_version.pri outside of the
    webkit source directory.
    
    Task-number: QTBUG-12379
    
    * WebCore.pro:
    
    WebKit/qt: [Qt] let WebKit inject itself into the qt configuration
    
    Patch by Oswald Buddenhagen <oswald.buddenhagen at nokia.com> on 2010-09-12
    Reviewed by Simon Hausmann.
    
    Task-number: QTBUG-12379
    
    * qt_webkit_version.pri: Use the faster + instead of *
    operator to add webkit to the config.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67343 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index db4cd15..77b61f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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
+        webkit source directory.
+
+        Task-number: QTBUG-12379
+
+        * WebCore.pro:
+
 2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
 
         [Qt] Build fix.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index de7002c..f2081cb 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -109,7 +109,7 @@ CONFIG(QTDIR_build) {
     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
 }
 moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
-include($$moduleFile)
+isEmpty(QT_BUILD_TREE):include($$moduleFile)
 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
 
 unix {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index fc57e70..d553dd7 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-12  Oswald Buddenhagen  <oswald.buddenhagen at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] let WebKit inject itself into the qt configuration
+
+        Task-number: QTBUG-12379
+
+        * qt_webkit_version.pri: Use the faster + instead of *
+        operator to add webkit to the config.
+
 2010-09-12  Martin Smith  <martin.smith at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/qt_webkit_version.pri b/WebKit/qt/qt_webkit_version.pri
index ca6299a..4147d8f 100644
--- a/WebKit/qt/qt_webkit_version.pri
+++ b/WebKit/qt/qt_webkit_version.pri
@@ -2,4 +2,4 @@ QT_WEBKIT_VERSION = 4.9.0
 QT_WEBKIT_MAJOR_VERSION = 4
 QT_WEBKIT_MINOR_VERSION = 9
 QT_WEBKIT_PATCH_VERSION = 0
-QT_CONFIG *= webkit
+QT_CONFIG += webkit

-- 
WebKit Debian packaging