diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
| commit | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (patch) | |
| tree | 6e16fefc7ece11ce4ec1e475a58a537a7acebaf8 /Source/WebKit2/UIProcess/API/qt | |
| parent | 5ef7c8a6a70875d4430752d146bdcb069605d71d (diff) | |
| download | qtwebkit-c311cf639cc1d6570d67b0a80a8ba04dc992a658.tar.gz | |
Imported WebKit commit 35255d8c2fd37ba4359e75fe0ebe6aec87687f9c (http://svn.webkit.org/repository/webkit/trunk@126284)
New snapshot that includes MSVC 64-bit build fix
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp index 0aed5d948..6250348a6 100644 --- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp @@ -380,9 +380,9 @@ void QRawWebView::sendWheelEvent(QWheelEvent* event) d->m_webPageProxy->handleWheelEvent(WebKit::NativeWebWheelEvent(event, QTransform())); } -#if ENABLE(TOUCH_EVENTS) void QRawWebView::sendTouchEvent(QTouchEvent* event) { +#if ENABLE(TOUCH_EVENTS) d->m_webPageProxy->handleTouchEvent(WebKit::NativeWebTouchEvent(event, QTransform())); -} #endif +} diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h index 4608ff9d7..f8f15b06d 100644 --- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h +++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h @@ -30,7 +30,6 @@ #include <WebKit2/WKContext.h> #include <WebKit2/WKPage.h> #include <WebKit2/WKPageGroup.h> -#include <wtf/Platform.h> QT_BEGIN_NAMESPACE class QRect; @@ -95,9 +94,7 @@ public: void sendKeyEvent(QKeyEvent*); void sendMouseEvent(QMouseEvent*, int clickCount = 0); void sendWheelEvent(QWheelEvent*); -#if ENABLE(TOUCH_EVENTS) void sendTouchEvent(QTouchEvent*); -#endif private: QRawWebViewPrivate* d; |