[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 dcb0f43064ac621377cc9e8237ae4bfe170b2273
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 11:31:44 2010 +0000

    [Qt] Trivial build fix for building WebKit2 inside Qt Creator
    
    Rubber-stamped by Andreas Kling.
    
    Similar to WebCore.pro, define a fallback for OUTPUT_DIR.
    
    * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c9d1911..28c98cd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-16  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Andreas Kling.
+
+        [Qt] Trivial build fix for building WebKit2 inside Qt Creator
+
+        Similar to WebCore.pro, define a fallback for OUTPUT_DIR.
+
+        * WebKit2.pro:
+
 2010-11-15  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 560de5e..c7f8805 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -3,6 +3,8 @@
 CONFIG += building-libs
 CONFIG += depend_includepath
 
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
+
 include($$PWD/../WebKit.pri)
 include($$PWD/../common.pri)
 include($$PWD/../WebCore/features.pri)

-- 
WebKit Debian packaging