[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 138e17f5627f492e9d926175108d7ea1d06078c0
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 16:46:29 2010 +0000

    Rubber-stamped by Tor Arne Vestbø.
    
    [Qt] REGRESSION(53187) Touchevent related tests fail
    
    https://bugs.webkit.org/show_bug.cgi?id=33602
    
    Pass the ENABLE_TOUCH_EVENTS to the IDL generators.
    
    * WebCore.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef21723..b4faec6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        [Qt] REGRESSION(53187) Touchevent related tests fail
+
+        https://bugs.webkit.org/show_bug.cgi?id=33602
+
+        Pass the ENABLE_TOUCH_EVENTS to the IDL generators.
+
+        * WebCore.pri:
+
 2010-01-13  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 4a59b09..9113144 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -140,6 +140,7 @@ contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
 contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
 contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
 contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
+contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
 
 
 ## Derived source generators

-- 
WebKit Debian packaging