[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 1acbf16edb0f3b13de4a7bb6c1389e6a279a18dd
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 23:39:50 2011 +0000

    2011-01-06  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Make sure touch is disabled in the minimal configuration
            https://bugs.webkit.org/show_bug.cgi?id=51316
    
            No new tests as there is no new functionality.
    
            * features.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b77aa59..a35f27f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-06  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Make sure touch is disabled in the minimal configuration
+        https://bugs.webkit.org/show_bug.cgi?id=51316
+
+        No new tests as there is no new functionality.
+
+        * features.pri:
+
 2011-01-06  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/features.pri b/WebCore/features.pri
index 96bb04d..ff54b14 100644
--- a/WebCore/features.pri
+++ b/WebCore/features.pri
@@ -141,7 +141,7 @@ contains(MOBILITY_CONFIG, sensors) {
     }
 }
 
-DEFINES += ENABLE_TOUCH_EVENTS=1
+!contains(DEFINES, ENABLE_TOUCH_EVENTS=.): DEFINES += ENABLE_TOUCH_EVENTS=1
 
 # HTML5 Media Support
 # We require QtMultimedia or Phonon

-- 
WebKit Debian packaging