2010-11-08 Benjamin Poulain <benjamin.poulain@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
parent cfcedeb9
......@@ -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
}
/*!
......
2010-11-08 Benjamin Poulain <benjamin.poulain@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@apple.com>
Reviewed by Darin Adler.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment