[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 13ca904bbff99743b0210fac6ac151eaca6e41b1
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 16:18:43 2010 +0000

    [Qt] ENABLE_RUBY flag was restored by r54649, but default value wasn't added for Qt port.
    https://bugs.webkit.org/show_bug.cgi?id=34698
    
    Reviewed by Tor Arne Vestbø.
    
    * WebCore.pri: Add ENABLE_RUBY=1 as default setting.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54656 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a00ca1..a977b76 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-11  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] ENABLE_RUBY flag was restored by r54649, but default value wasn't added for Qt port.
+        https://bugs.webkit.org/show_bug.cgi?id=34698
+
+        * WebCore.pri: Add ENABLE_RUBY=1 as default setting.
+
 2010-02-11  Steve Block  <steveblock at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 07b1532..c1b2e5a 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -52,6 +52,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0
 !contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0
 !contains(DEFINES, ENABLE_VIDEO=.): DEFINES += ENABLE_VIDEO=1
+!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
 
 # SVG support
 !contains(DEFINES, ENABLE_SVG=0) {

-- 
WebKit Debian packaging