[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2853f59609e853fface2394fd9effcffe79d49be
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 16:03:24 2010 +0000

    [Qt] Make it possible to do builds with separate debug info in packages
    
    Reviewed by Tor Arne Vestbø.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1691332..68744cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,14 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Make it possible to do builds with separate debug info in packages
+
+        * WebCore.pro:
+
+2010-03-11  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         [Qt] Avoid double-buffering with Qt image decoders
 
         Pass QIODevice::Unbuffered when opening the QBuffer that
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 02de198..7d1a56a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2864,7 +2864,7 @@ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
     }
 }
 
-CONFIG(standalone_package):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
+CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
     # start with 4.5
     # Remove the following 2 lines if you want debug information in WebCore
     CONFIG -= separate_debug_info

-- 
WebKit Debian packaging