[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 36d116cf88c48509808663e1b20cc4899761b039
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 17:55:09 2011 +0000

    2011-01-05  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] [Symbian] Make CONFIG-=def_files the default configuration for trunk builds
            https://bugs.webkit.org/show_bug.cgi?id=51888
    
            Overrule Qt's default from qconfig.pri for non-production builds so
            that CONFIG(def_files) evaluates to false and QtWebKit trunk builds succeed.
    
            No new tests as there is no new functionality.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 34821b4..6b25592 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-05  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] [Symbian] Make CONFIG-=def_files the default configuration for trunk builds
+        https://bugs.webkit.org/show_bug.cgi?id=51888
+
+        Overrule Qt's default from qconfig.pri for non-production builds so
+        that CONFIG(def_files) evaluates to false and QtWebKit trunk builds succeed.
+
+        No new tests as there is no new functionality.
+
+        * WebCore.pro:
+
 2011-01-05  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r74778.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4a50371..66e94e4 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -74,6 +74,8 @@ symbian: {
         QMAKE_CXXFLAGS -= --thumb
     }
     CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
+
+    !CONFIG(production):CONFIG-=def_files
 }
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..

-- 
WebKit Debian packaging