[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 0557d7a0b17bd5bedf4e64c07f2ed0964922b7bd
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 02:15:26 2010 +0000

    2010-11-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] build error in WebKit/qt/Api/qwebpage.cpp in Qt 4.7.0
            https://bugs.webkit.org/show_bug.cgi?id=47427
    
            Add a missing guard in order to be able to compile when
            ENABLE(TOUCH_EVENTS) is not defined.
    
            * Api/qwebpage.cpp:
            (QWebPagePrivate::touchEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71593 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index a6ca65a..a716b55 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1311,6 +1311,7 @@ void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev)
 
 bool QWebPagePrivate::touchEvent(QTouchEvent* event)
 {
+#if ENABLE(TOUCH_EVENTS)
     WebCore::Frame* frame = QWebFramePrivate::core(mainFrame);
     if (!frame->view())
         return false;
@@ -1320,6 +1321,10 @@ bool QWebPagePrivate::touchEvent(QTouchEvent* event)
 
     // Return whether the default action was cancelled in the JS event handler
     return frame->eventHandler()->handleTouchEvent(PlatformTouchEvent(event));
+#else
+    event->ignore();
+    return false;
+#endif
 }
 
 /*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index fdfa41f..0abcb9e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] build error in WebKit/qt/Api/qwebpage.cpp in Qt 4.7.0
+        https://bugs.webkit.org/show_bug.cgi?id=47427
+
+        Add a missing guard in order to be able to compile when
+        ENABLE(TOUCH_EVENTS) is not defined.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::touchEvent):
+
 2010-11-08  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging